Avoid the long whats_supported line being mixed with output from other processes

[users/jgh/exim.git] / test / configure.ac

diff --git a/test/configure.ac b/test/configure.ac
index a38b5b0ae34b6703c8df623a8e115f6948eda561..8b4fafa831bf6479d1cb138cea897e909d315f2b 100644 (file)
--- a/test/configure.ac
+++ b/test/configure.ac
@@ -15,8 +15,10 @@ AC_PROG_CC
 
 dnl Checks for header files.
 
 
 dnl Checks for header files.
 

+AC_CHECK_HEADERS(sys/socket.h)

 AC_CHECK_HEADERS(openssl/crypto.h,[CLIENT_SSL=bin/client-ssl])
 AC_CHECK_HEADERS(gnutls/gnutls.h,[CLIENT_GNUTLS=bin/client-gnutls])
 AC_CHECK_HEADERS(openssl/crypto.h,[CLIENT_SSL=bin/client-ssl])
 AC_CHECK_HEADERS(gnutls/gnutls.h,[CLIENT_GNUTLS=bin/client-gnutls])

+AC_CHECK_HEADERS(gnutls/gnutls.h,[B64_GNUTLS=bin/ed25519_privkey_pem_to_pubkey_raw_b64])

 
 dnl The check on dynamically loaded modules requires the building of
 dnl something to load. This seems to be something that varies between
 
 dnl The check on dynamically loaded modules requires the building of
 dnl something to load. This seems to be something that varies between


@@ -29,7 +31,7 @@ dnl "install" script for some weird reason.
 host_os=`uname -s`
 
 case $CC-$host_os in
 host_os=`uname -s`
 
 case $CC-$host_os in

-  gcc-*linux* | gcc-*Linux* | gcc-*LINUX* | gcc-FreeBSD)
+  gcc-*linux* | gcc-*Linux* | gcc-*LINUX* | gcc-FreeBSD | gcc-*SunOS* | cc-*SunOS* )

     LOADED=bin/loaded
     LOADED_OPT="-shared -fPIC"
     echo "Using gcc on $host_os: will compile dynamically loaded module"
     LOADED=bin/loaded
     LOADED_OPT="-shared -fPIC"
     echo "Using gcc on $host_os: will compile dynamically loaded module"


@@ -52,12 +54,17 @@ dnl Solaris requires additional libraries for networking functions.
 
 AC_SEARCH_LIBS([inet_addr], [nsl])
 AC_SEARCH_LIBS([connect], [socket])
 
 AC_SEARCH_LIBS([inet_addr], [nsl])
 AC_SEARCH_LIBS([connect], [socket])

+AC_SEARCH_LIBS([inet_pton], [nsl socket resolv])
+AC_SEARCH_LIBS([inet_ntop], [nsl socket resolv])
+
+AC_CHECK_FUNCS_ONCE(getaddrinfo)

 
 dnl "Export" these variables
 
 AC_SUBST(BIND_8_COMPAT)
 AC_SUBST(CLIENT_SSL)
 AC_SUBST(CLIENT_GNUTLS)
 
 dnl "Export" these variables
 
 AC_SUBST(BIND_8_COMPAT)
 AC_SUBST(CLIENT_SSL)
 AC_SUBST(CLIENT_GNUTLS)

+AC_SUBST(B64_GNUTLS)

 AC_SUBST(LOADED)
 AC_SUBST(LOADED_OPT)
 AC_SUBST(LIBS)
 AC_SUBST(LOADED)
 AC_SUBST(LOADED_OPT)
 AC_SUBST(LIBS)