Add libwrap at the end of the configure run

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 6c28f39a9e0ed81937a65f2b04cdc96012fc3613..8f4585a7c7800ae964693ad20c6014654aa93ac5 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -92,6 +92,35 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[
   fi
 ])
 
+AC_DEFUN([WORKING_GETADDRINFO],[
+       AC_CHECK_FUNCS([getaddrinfo],[
+               AC_MSG_CHECKING([whether getaddrinfo() works])
+               AC_TRY_RUN([
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int
+main(int argc, char **argv)
+{
+       struct addrinfo hints, *ai;
+       memset(&hints, 0, sizeof(hints));
+       hints.ai_flags = AI_PASSIVE;
+       hints.ai_socktype = SOCK_STREAM;
+       hints.ai_family = PF_UNSPEC;
+       if(getaddrinfo(NULL, "0", &hints, &ai) != 0)
+               return 1;
+       return 0;
+}
+               ],[
+               AC_DEFINE([HAVE_WORKING_GETADDRINFO], 1, [getaddrinfo(0)])
+               AC_MSG_RESULT(yes)
+               ],[
+               AC_MSG_RESULT(no)
+               ])
+       ])
+])
+
 if test "$GCC" = "yes"; then
        # We are using the GNU C compiler. Good!
        CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
@@ -186,9 +215,12 @@ AC_CHECK_FUNCS([ \
        AC_MSG_ERROR([required function missing!]))
 
 # Optional functions
-AC_CHECK_FUNCS_ONCE([ \
-       gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
-       snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
+AC_CHECK_FUNCS_ONCE([
+       arc4random arc4random_stir gai_strerror getnameinfo inet_aton \
+       sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \
+       strtok_r unsetenv waitpid])
+
+WORKING_GETADDRINFO
 
 # -- Configuration options --
 
@@ -431,7 +463,9 @@ AC_ARG_WITH(tcp-wrappers,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_MSG_CHECKING(for hosts_access)
+                       saved_LIBS="$LIBS"
                        LIBS="-lwrap $LIBS"
+                       LIBS_END="-lwrap $LIBS_END"
                        AC_TRY_LINK([
 #include <tcpd.h>
 int allow_severity = 0;
@@ -446,6 +480,7 @@ int deny_severity = 0;
                                AC_MSG_RESULT(no)
                                AC_MSG_ERROR([Can't enable TCP wrappers!])
                        ])
+                       LIBS="$saved_LIBS"
                fi
        ]
 )
@@ -527,14 +562,15 @@ if test "$x_ircplus_on" = "yes"; then
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_CHECK_LIB(iconv, iconv_open)
-                       AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes,
+                       AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes)
+                       if test "$x_iconv_on" != "yes"; then
                                AC_CHECK_LIB(iconv, libiconv_open)
-                               AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes,
-                                       AC_MSG_ERROR([Can't enable libiconv support!])
-                               )
-                       )
-                 fi
-               ]
+                               AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes)
+                       fi
+                       if test "$x_iconv_on" != "yes"; then
+                               AC_MSG_ERROR([Can't enable libiconv support!])
+                       fi
+               fi ]
        )
        if test "$x_iconv_on" = "yes"; then
                AC_DEFINE(ICONV, 1)
@@ -600,9 +636,12 @@ AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" )
 AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
 AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
 
-# Add additional CFLAGS, eventually specified on the command line, but after
-# running this configure script. Useful for "-Werror" for example.
+# Add additional CFLAGS, LDFLAGS and LIBS which were specified on the command
+# line or by some tests from above, but after running this script. Useful for
+# adding "-Werror", for example:
 test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+test -n "$LDFLAGS_END" && LDFLAGS="$LDFLAGS $LDFLAGS_END"
+test -n "$LIBS_END" && LIBS="$LIBS $LIBS_END"
 
 # -- Generate files --
 
@@ -701,7 +740,7 @@ test "$x_ipv6_on" = "yes" \
        && echo $ECHO_N "yes   $ECHO_C" \
        || echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        I/O backend: $ECHO_C"
-       echo "\"$x_io_backend\""
+       echo "$x_io_backend"
 
 echo $ECHO_N "        PAM support: $ECHO_C"
 test "$x_pam_on" = "yes" \