Don't forward KILLs to other servers if they've been blocked locally

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 2a9fa04a4581f1bc7a50a21b309f78702388c63a..56139968ff01e7e56d226081dc0c594852462010 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -22,7 +22,7 @@ m4_ifdef([AM_SILENT_RULES],
 
 # -- Initialisation --
 
-AC_PREREQ([2.67])
+AC_PREREQ([2.61])
 AC_INIT([ngIRCd],[VERSION_ID],[ngircd-ml@ngircd.barton.de],[ngircd],[http://ngircd.barton.de/])
 
 AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
@@ -66,6 +66,7 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
 AC_PROG_RANLIB
 
 # -- Compiler Features --
@@ -154,7 +155,7 @@ AC_HEADER_TIME
 # Required header files
 AC_CHECK_HEADERS([ \
        fcntl.h netdb.h netinet/in.h stdlib.h string.h \
-       strings.h sys/socket.h sys/time.h unistd.h \
+       strings.h sys/socket.h sys/time.h sys/types.h unistd.h \
        ],,AC_MSG_ERROR([required C header missing!]))
 
 # Optional header files
@@ -220,8 +221,8 @@ AC_CHECK_FUNCS([ \
 # Optional functions
 AC_CHECK_FUNCS_ONCE([
        arc4random arc4random_stir gai_strerror getnameinfo inet_aton \
-       sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \
-       strtok_r unsetenv waitpid])
+       setgroups sigaction sigprocmask snprintf strdup strlcat strlcpy \
+       strndup strtok_r unsetenv vsnprintf waitpid])
 
 WORKING_GETADDRINFO
 
@@ -417,8 +418,8 @@ AC_ARG_WITH(openssl,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_CHECK_LIB(crypto, BIO_s_mem)
-                       AC_CHECK_LIB(ssl, SSL_library_init)
-                       AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
+                       AC_CHECK_LIB(ssl, SSL_new)
+                       AC_CHECK_FUNCS(SSL_new, x_ssl_openssl=yes,
                                AC_MSG_ERROR([Can't enable openssl])
                        )
                fi
@@ -466,8 +467,12 @@ 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_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <tcpd.h>
 int allow_severity = 0;
 int deny_severity = 0;
@@ -481,6 +486,7 @@ int deny_severity = 0;
                                AC_MSG_RESULT(no)
                                AC_MSG_ERROR([Can't enable TCP wrappers!])
                        ])
+                       LIBS="$saved_LIBS"
                fi
        ]
 )
@@ -636,9 +642,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 --
 
@@ -667,7 +676,9 @@ if test $? -eq 0; then
        # Generate debian/ link if the dpkg command exists
        # (read: if we are running on a debian compatible system)
        echo "creating Debian-specific links ..."
-       test -f debian/rules || ln -s contrib/Debian debian
+       if test ! -f debian/rules -a -f contrib/Debian/rules; then
+               ln -s contrib/Debian debian
+       fi
 fi
 
 # -- Result --