diff options
| author | Brent Cook <busterb@gmail.com> | 2018-03-14 07:29:04 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2018-03-14 07:29:04 -0500 |
| commit | 3fb9e63b907186c70fb79e818d899ccb67b4b421 (patch) | |
| tree | 6d1bd111880dff4838796915a68076339c37cbc3 /m4 | |
| parent | b7397ab184d303b7cd6a41eaf121e47834c5b707 (diff) | |
| download | portable-3fb9e63b907186c70fb79e818d899ccb67b4b421.tar.gz portable-3fb9e63b907186c70fb79e818d899ccb67b4b421.tar.bz2 portable-3fb9e63b907186c70fb79e818d899ccb67b4b421.zip | |
bump base requirement to Windows Vista, use builtin inet_ntop/pton
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/check-libc.m4 | 4 | ||||
| -rw-r--r-- | m4/check-os-options.m4 | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index 5bb4287..cacdd17 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 | |||
| @@ -2,7 +2,7 @@ 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 inet_ntop inet_pton memmem]) | 5 | AC_CHECK_FUNCS([asprintf freezero 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]) |
| @@ -22,8 +22,6 @@ AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [ | |||
| 22 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) | 22 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) |
| 23 | AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) | 23 | AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) |
| 24 | AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) | 24 | AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) |
| 25 | AM_CONDITIONAL([HAVE_INET_NTOP], [test "x$ac_cv_func_inet_ntop" = xyes]) | ||
| 26 | AM_CONDITIONAL([HAVE_INET_PTON], [test "x$ac_cv_func_inet_pton" = xyes]) | ||
| 27 | AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) | 25 | AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) |
| 28 | AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) | 26 | AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) |
| 29 | AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) | 27 | AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) |
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 3cf1956..414e63d 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 | |||
| @@ -106,7 +106,7 @@ char buf[1]; getentropy(buf, 1); | |||
| 106 | BUILD_NC=no | 106 | BUILD_NC=no |
| 107 | CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO" | 107 | CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO" |
| 108 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" | 108 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" |
| 109 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0501" | 109 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" |
| 110 | CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED" | 110 | CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED" |
| 111 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) | 111 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) |
| 112 | ;; | 112 | ;; |