diff options
| author | Evgen Bodunov <molind@gmail.com> | 2017-11-23 15:28:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 15:28:25 +0300 |
| commit | aff3a43fa099aab39927d93fc3f0cd861b15876d (patch) | |
| tree | 6d0801407f37729f9fd2ea896269a3369991223f /m4 | |
| parent | 53b5b56f39783ee51846b0f72ff736ab8373624d (diff) | |
| download | portable-aff3a43fa099aab39927d93fc3f0cd861b15876d.tar.gz portable-aff3a43fa099aab39927d93fc3f0cd861b15876d.tar.bz2 portable-aff3a43fa099aab39927d93fc3f0cd861b15876d.zip | |
Fixed getpagesize detection on Android
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/check-libc.m4 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index b1b5ef4..5bb4287 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 | |||
| @@ -2,10 +2,23 @@ AC_DEFUN([CHECK_LIBC_COMPAT], [ | |||
| 2 | # Check for libc headers | 2 | # Check for libc headers |
| 3 | AC_CHECK_HEADERS([err.h readpassphrase.h]) | 3 | AC_CHECK_HEADERS([err.h readpassphrase.h]) |
| 4 | # Check for general libc functions | 4 | # Check for general libc functions |
| 5 | AC_CHECK_FUNCS([asprintf freezero getpagesize inet_ntop inet_pton memmem]) | 5 | AC_CHECK_FUNCS([asprintf freezero inet_ntop inet_pton memmem]) |
| 6 | AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) | 6 | AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) |
| 7 | AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) | 7 | AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) |
| 8 | AC_CHECK_FUNCS([timegm _mkgmtime]) | 8 | AC_CHECK_FUNCS([timegm _mkgmtime]) |
| 9 | AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [ | ||
| 10 | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | ||
| 11 | // Since Android NDK v16 getpagesize is defined as inline inside unistd.h | ||
| 12 | #ifdef __ANDROID__ | ||
| 13 | # include <unistd.h> | ||
| 14 | #endif | ||
| 15 | ]], [[ | ||
| 16 | getpagesize(); | ||
| 17 | ]])], | ||
| 18 | [ ac_cv_func_getpagesize="yes" ], | ||
| 19 | [ ac_cv_func_getpagesize="no" | ||
| 20 | ]) | ||
| 21 | ]) | ||
| 9 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) | 22 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) |
| 10 | AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) | 23 | AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) |
| 11 | AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) | 24 | AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) |