Update NEWS and ChangeLog for ngIRCd 22.1

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index bc30bed8a721a4b05f42d2d1fccd6b7dd85cb8d9..bd40694f3ccdef563aefa32803a2941b4cab1564 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,8 +23,7 @@ m4_ifdef([AM_SILENT_RULES],
 # -- Initialisation --
 
 AC_PREREQ([2.61])
-AC_INIT([ngIRCd], VERSION_ID,
-       [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
+AC_INIT([ngIRCd],[VERSION_ID],[ngircd-ml@ngircd.barton.de],[ngircd],[http://ngircd.barton.de/])
 
 AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
@@ -67,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 --
@@ -84,7 +84,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[
        AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
        ssp_old_cflags="$CFLAGS"
        CFLAGS="$CFLAGS -fstack-protector-all"
-       AC_TRY_LINK(,,, ssp_cc=no)
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],[],[ssp_cc=no])
        echo $ssp_cc
        CFLAGS="$ssp_old_cflags"
        if test "X$ssp_cc" = "Xyes"; then
@@ -96,7 +96,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[
 AC_DEFUN([WORKING_GETADDRINFO],[
        AC_CHECK_FUNCS([getaddrinfo],[
                AC_MSG_CHECKING([whether getaddrinfo() works])
-               AC_TRY_RUN([
+               AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -113,11 +113,13 @@ main(int argc, char **argv)
                return 1;
        return 0;
 }
-               ],[
+               ]])],[
                AC_DEFINE([HAVE_WORKING_GETADDRINFO], 1, [getaddrinfo(0)])
                AC_MSG_RESULT(yes)
                ],[
                AC_MSG_RESULT(no)
+               ],[
+               AC_MSG_RESULT(no)
                ])
        ])
 ])
@@ -153,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
@@ -165,20 +167,19 @@ AC_CHECK_HEADERS_ONCE([ \
 # -- Datatypes --
 
 AC_MSG_CHECKING(whether socklen_t exists)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>
-       ],[
+       ]],[[
        socklen_t a, b;
        a = 2; b = 4; a += b;
-       ],[
+       ]])],[
        AC_DEFINE(HAVE_socklen_t) AC_MSG_RESULT(yes)
        ],[
        AC_MSG_RESULT(no)
 ])
 
 AC_TYPE_PID_T
-AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T
@@ -466,14 +467,18 @@ AC_ARG_WITH(tcp-wrappers,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_MSG_CHECKING(for hosts_access)
+                       saved_LIBS="$LIBS"
                        LIBS="-lwrap $LIBS"
-                       AC_TRY_LINK([
+                       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;
-                               ],[
+                               ]],[[
                                tcpd_warn("link test");
-                               ],[
+                               ]])],[
                                AC_MSG_RESULT(yes)
                                AC_DEFINE(TCPWRAP, 1)
                                x_tcpwrap_on=yes
@@ -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 --