From 320a5588a8f195ee982722729c2b8dc99c68756f Mon Sep 17 00:00:00 2001 From: Martin Johansson Date: Wed, 7 Sep 2011 22:12:47 +0200 Subject: [PATCH] Fix portability issues. Add poll.h to header checks. --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a5173bc..6521769 100644 --- a/configure.ac +++ b/configure.ac @@ -45,12 +45,12 @@ AC_CHECK_HEADERS([google/protobuf-c/protobuf-c.h], [], [AC_MSG_ERROR([could not AC_CHECK_LIB([protobuf-c], [protobuf_c_data_buffer_init], [], [AC_MSG_ERROR([could not find protobuf-c library])]) AC_CHECK_HEADERS([libconfig.h], [], [AC_MSG_ERROR([could not find libconfig.h])]) AC_CHECK_LIB([config], [config_init], [], [AC_MSG_ERROR([could not find libconfig])]) -AS_IF([test "x$with_ssl" == xpolarssl], [ +AS_IF([test "x$with_ssl" = xpolarssl], [ AC_CHECK_HEADERS([polarssl/ssl.h], [], [AC_MSG_ERROR([could not find polarssl/ssl.h])]) AC_CHECK_LIB([polarssl], [ssl_init], [], [AC_MSG_ERROR([could not find libpolarssl])]) AC_DEFINE([USE_POLARSSL], [], [Use PolarSSL]) ]) -AS_IF([test "x$with_ssl" == xopenssl], [ +AS_IF([test "x$with_ssl" = xopenssl], [ AC_CHECK_HEADERS([openssl/ssl.h], [], [AC_MSG_ERROR([could not find openssl/ssl.h])]) AC_CHECK_LIB([crypto], [BN_init], [], [AC_MSG_ERROR([could not find libcrypto])]) AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_ERROR([could not find libssl])]) @@ -58,7 +58,7 @@ AS_IF([test "x$with_ssl" == xopenssl], [ # Checks for header files. AC_FUNC_ALLOCA -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h], [], [AC_MSG_ERROR([missing a required header])]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/tcp.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h sys/poll.h], [], [AC_MSG_ERROR([missing a required header])]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL @@ -73,9 +73,7 @@ AC_TYPE_UINT64_T AC_TYPE_UINT8_T # Checks for library functions. -AC_FUNC_FORK -#AC_FUNC_MALLOC -AC_CHECK_FUNCS([ftruncate gettimeofday inet_ntoa memchr memmove memset socket strdup strerror strrchr uname], [], [AC_MSG_ERROR([missing a required func])]) +AC_CHECK_FUNCS([ftruncate gettimeofday inet_ntoa memchr memmove memset socket strdup strerror strrchr uname poll], [], [AC_MSG_ERROR([missing a required func])]) AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT -- 2.30.2