summaryrefslogtreecommitdiff
path: root/infrastructure/m4/boxbackup_tests.m4
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2012-11-14 23:47:55 +0000
committerChris Wilson <chris+github@qwirx.com>2012-11-14 23:47:55 +0000
commit3265cfc91dfbfbf4cef7d1da9f805918c23548d1 (patch)
tree8c2333236106334376242c804f335d69104ed7b4 /infrastructure/m4/boxbackup_tests.m4
parentc7da86f9a76b189aed33814e07d22df04642438d (diff)
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB to search for EVP_CipherInit_ex,
as it should already be in LIBS by this point and we don't really want to add a duplicate if we don't need it. http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Libraries.html also recommends the use of AC_SEARCH_LIBS instead. Check whether we have getpeername() and sys/un.h to fix compile errors on Windows with /dev/log fd leak test.
Diffstat (limited to 'infrastructure/m4/boxbackup_tests.m4')
-rw-r--r--infrastructure/m4/boxbackup_tests.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
index 1bdd497d..9e6bc2f2 100644
--- a/infrastructure/m4/boxbackup_tests.m4
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -109,9 +109,9 @@ AC_ARG_ENABLE(
[old-ssl],
[AC_HELP_STRING([--enable-old-ssl],
[Allow use of pre-0.9.7 Open SSL - NOT RECOMMENDED, read the documentation])])
-AC_CHECK_LIB(
- [crypto],
- [EVP_CipherInit_ex],, [
+AC_SEARCH_LIBS(
+ [EVP_CipherInit_ex],
+ [crypto],, [
if test "x$enable_old_ssl" = "xyes"; then
AC_DEFINE([HAVE_OLD_SSL], 1, [Define to 1 if SSL is pre-0.9.7])
else
@@ -136,8 +136,8 @@ AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([dlfcn.h fcntl.h getopt.h process.h pwd.h signal.h])
AC_CHECK_HEADERS([syslog.h time.h cxxabi.h])
AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h])
-AC_CHECK_HEADERS([sys/file.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h])
-AC_CHECK_HEADERS([sys/uio.h sys/xattr.h])
+AC_CHECK_HEADERS([sys/file.h sys/param.h sys/socket.h sys/time.h sys/types.h])
+AC_CHECK_HEADERS([sys/uio.h sys/un.h sys/wait.h sys/xattr.h])
AC_CHECK_HEADERS([bsd/unistd.h])
AC_CHECK_HEADERS([sys/socket.h], [have_sys_socket_h=yes])
AC_CHECK_HEADERS([winsock2.h], [have_winsock2_h=yes])
@@ -254,7 +254,7 @@ AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
AC_TYPE_SIGNAL
AC_FUNC_STAT
-AC_CHECK_FUNCS([getpeereid lchown setproctitle getpid gettimeofday waitpid ftruncate])
+AC_CHECK_FUNCS([getpeereid getpeername lchown setproctitle getpid gettimeofday waitpid ftruncate])
AC_SEARCH_LIBS([setproctitle], ["bsd"])
# NetBSD implements kqueue too differently for us to get it fixed by 0.10