Revert "Testsuite: tidyup runtest"

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

diff --git a/test/configure.ac b/test/configure.ac
index 83f1aa05db7b365be510b10c0e8744b2eb6dafbe..017d22d381c8d44019ccd0f81e4a51e798bcd601 100644 (file)
--- a/test/configure.ac
+++ b/test/configure.ac
@@ -15,6 +15,7 @@ AC_PROG_CC
 
 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])
 
@@ -48,6 +49,13 @@ case $host_os in
     ;;
 esac
 
+dnl Solaris requires additional libraries for networking functions.
+
+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])
+
 dnl "Export" these variables
 
 AC_SUBST(BIND_8_COMPAT)
@@ -55,6 +63,7 @@ AC_SUBST(CLIENT_SSL)
 AC_SUBST(CLIENT_GNUTLS)
 AC_SUBST(LOADED)
 AC_SUBST(LOADED_OPT)
+AC_SUBST(LIBS)
 
 dnl This must be last; it determines what files are written