diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/check-libc.m4 | 36 | ||||
| -rw-r--r-- | m4/check-os-options.m4 | 5 |
2 files changed, 2 insertions, 39 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index e511f6d..2ca08a5 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 @@ -1,12 +1,10 @@ AC_DEFUN([CHECK_LIBC_COMPAT], [ -# Check for libc headers -AC_CHECK_HEADERS([err.h readpassphrase.h]) # Check for general libc functions AC_CHECK_FUNCS([asprintf freezero memmem]) -AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) +AC_CHECK_FUNCS([reallocarray recallocarray]) AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) AC_CHECK_FUNCS([timegm _mkgmtime timespecsub]) -AC_CHECK_FUNCS([getprogname syslog syslog_r]) +AC_CHECK_FUNCS([getprogname]) AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ // Since Android NDK v16 getpagesize is defined as inline inside unistd.h @@ -24,7 +22,6 @@ AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) -AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) AM_CONDITIONAL([HAVE_RECALLOCARRAY], [test "x$ac_cv_func_recallocarray" = xyes]) AM_CONDITIONAL([HAVE_STRLCAT], [test "x$ac_cv_func_strlcat" = xyes]) @@ -35,35 +32,6 @@ AM_CONDITIONAL([HAVE_STRSEP], [test "x$ac_cv_func_strsep" = xyes]) AM_CONDITIONAL([HAVE_STRTONUM], [test "x$ac_cv_func_strtonum" = xyes]) AM_CONDITIONAL([HAVE_TIMEGM], [test "x$ac_cv_func_timegm" = xyes]) AM_CONDITIONAL([HAVE_GETPROGNAME], [test "x$ac_cv_func_getprogname" = xyes]) -AM_CONDITIONAL([HAVE_SYSLOG], [test "x$ac_cv_func_syslog" = xyes]) -AM_CONDITIONAL([HAVE_SYSLOG_R], [test "x$ac_cv_func_syslog_r" = xyes]) -]) - -AC_DEFUN([CHECK_SYSCALL_COMPAT], [ -AC_CHECK_FUNCS([accept4 pipe2 pledge poll socketpair]) -AM_CONDITIONAL([HAVE_ACCEPT4], [test "x$ac_cv_func_accept4" = xyes]) -AM_CONDITIONAL([HAVE_PIPE2], [test "x$ac_cv_func_pipe2" = xyes]) -AM_CONDITIONAL([HAVE_PLEDGE], [test "x$ac_cv_func_pledge" = xyes]) -AM_CONDITIONAL([HAVE_POLL], [test "x$ac_cv_func_poll" = xyes]) -AM_CONDITIONAL([HAVE_SOCKETPAIR], [test "x$ac_cv_func_socketpair" = xyes]) -]) - -AC_DEFUN([CHECK_B64_NTOP], [ -AC_SEARCH_LIBS([b64_ntop],[resolv]) -AC_SEARCH_LIBS([__b64_ntop],[resolv]) -AC_CACHE_CHECK([for b64_ntop], ac_cv_have_b64_ntop_arg, [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <resolv.h> - ]], [[ b64_ntop(NULL, 0, NULL, 0); ]])], - [ ac_cv_have_b64_ntop_arg="yes" ], - [ ac_cv_have_b64_ntop_arg="no" - ]) -]) -AM_CONDITIONAL([HAVE_B64_NTOP], [test "x$ac_cv_func_b64_ntop_arg" = xyes]) ]) AC_DEFUN([CHECK_CRYPTO_COMPAT], [ diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 8241aee..6913790 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -123,11 +123,6 @@ char buf[1]; getentropy(buf, 1); *) ;; esac -AC_ARG_ENABLE([nc], - AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)])) -AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes]) -AM_CONDITIONAL([BUILD_NC], [test x$BUILD_NC = xyes -o "x$enable_nc" = xyes]) - AM_CONDITIONAL([HOST_AIX], [test x$HOST_OS = xaix]) AM_CONDITIONAL([HOST_CYGWIN], [test x$HOST_OS = xcygwin]) AM_CONDITIONAL([HOST_DARWIN], [test x$HOST_OS = xdarwin]) |