]> arthur.barton.de Git - ngircd-alex.git/blobdiff - configure.in
Fixed validation of server names containing digits.
[ngircd-alex.git] / configure.in
index 62617bdd2d2ba2cc39df7cce36b3749334dd7c82..9b2c7128fa259c642d4d199b665a8380ca6a6a7d 100644 (file)
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.107 2005/03/20 17:23:36 alex Exp $
+# $Id: configure.in,v 1.124 2006/10/02 21:57:13 fw Exp $
 #
 
 # -- Initialisation --
@@ -30,7 +30,7 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
 AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
-AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
+AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included])
 AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
@@ -53,12 +53,31 @@ AC_PROG_RANLIB
 
 AM_C_PROTOTYPES
 AC_C_CONST
+AC_C_INLINE
 
 # -- Hard coded system and compiler dependencies/features/options ... --
 
+AC_DEFUN([GCC_STACK_PROTECT_CC],[
+  ssp_cc=yes
+  # we use -fstack-protector-all for the test to enfoce the use of the guard variable 
+  AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
+  ssp_old_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS -fstack-protector-all"
+  AC_TRY_LINK(,,, ssp_cc=no)
+  echo $ssp_cc
+  CFLAGS="$ssp_old_cflags"
+  if test "X$ssp_cc" = "Xyes"; then
+      CFLAGS="$CFLAGS -fstack-protector"
+      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+  fi
+])
+
+
 if test "$GCC" = "yes"; then
        # We are using the GNU C compiler. Good!
        CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
+
+       GCC_STACK_PROTECT_CC
 fi
 
 case "$target_os" in
@@ -91,8 +110,8 @@ AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h])
 
 AC_MSG_CHECKING(whether socklen_t exists)
 AC_TRY_COMPILE([
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
        ],[
        socklen_t a, b;
        a = 2; b = 4; a += b;
@@ -105,6 +124,7 @@ AC_TRY_COMPILE([
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 
+
 # -- Libraries --
 
 AC_CHECK_LIB(UTIL,memmove)
@@ -118,10 +138,10 @@ AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
        bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
-       memset realloc setsid setsockopt socket strcasecmp strchr strerror \
+       memset realloc setsid setsockopt socket strcasecmp strchr strcspn strerror \
        strstr waitpid],,AC_MSG_ERROR([required function missing!]))
 
-AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat)
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat)
 
 AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
        AC_MSG_ERROR([required function select() is missing!])
@@ -178,6 +198,82 @@ if test "$x_zlib_on" = "yes"; then
        AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+
+x_io_backend=select\(\)
+AC_ARG_WITH(poll,
+       [  --without-poll          disable poll support (autodetected by default)],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
+                               AC_MSG_ERROR([Can't enable poll support!])
+                       )
+               fi
+       ],
+       [
+               AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
+       ]
+)
+
+
+AC_ARG_WITH(devpoll,
+       [  --without-devpoll          disable /dev/poll support (autodetected by default)],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+
+                               AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
+               fi
+       ],
+       [
+               AC_CHECK_HEADERS(sys/devpoll.h,x_io_backend=/dev/poll,)
+       ]
+)
+
+AC_ARG_WITH(epoll,
+       [  --without-epoll         disable epoll support (autodetected by default)],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\),
+                               AC_MSG_ERROR([Can't enable epoll support!])
+                       )
+               fi
+       ],
+       [
+               AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\))
+       ]
+)
+
+
+AC_ARG_WITH(kqueue,
+       [  --without-kqueue        disable kqueue support (autodetected by default)],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
+                               AC_MSG_ERROR([Can't enable kqueue support!])
+                       )
+               fi
+       ],
+       [
+               AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
+       ]
+)
+
+
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
@@ -187,13 +283,14 @@ AC_ARG_WITH(tcp-wrappers,
                                CPPFLAGS="-I$withval/include $CPPFLAGS"
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
-                       AC_CHECK_LIB(wrap, hosts_access)
                        AC_MSG_CHECKING(for hosts_access)
+                       LIBS="-lwrap $LIBS"
                        AC_TRY_LINK([
-                               #include <tcpd.h>
+#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity = 0;
                                ],[
-                               void *ptr;
-                               ptr = hosts_access;
+                               tcpd_warn("link test");
                                ],[
                                AC_MSG_RESULT(yes)
                                AC_DEFINE(TCPWRAP, 1)
@@ -206,34 +303,35 @@ AC_ARG_WITH(tcp-wrappers,
        ]
 )
 
-x_rendezvous_on=no
-AC_ARG_WITH(rendezvous,
-       [  --with-rendezvous       enable support for "Rendezvous"],
+x_zeroconf_on=no
+AC_ARG_WITH(zeroconf,
+       [  --with-zeroconf         enable support for "Zeroconf"],
        [       if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
                                CPPFLAGS="-I$withval/include $CPPFLAGS"
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
-                       AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx,
+                       AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_zeroconf_on=osx,
                        [
                                AC_CHECK_LIB(pthread, pthread_mutexattr_init)
                                AC_CHECK_LIB(howl, sw_discovery_init)
                                AC_CHECK_FUNCS(sw_discovery_init, \
-                                x_rendezvous_on=howl, \
-                                AC_MSG_ERROR([Can't enable Rendezvous!]))
+                                x_zeroconf_on=howl, \
+                                AC_MSG_ERROR([Can't enable Zeroconf!]))
                        ])
                fi
        ]
 )
-if test "$x_rendezvous_on" = "osx"; then
+if test "$x_zeroconf_on" = "osx"; then
        AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
         mach/port.h],,AC_MSG_ERROR([required C header missing!]))
-       AC_DEFINE(RENDEZVOUS, 1)
+       AC_DEFINE(ZEROCONF, 1)
 fi
-if test "$x_rendezvous_on" = "howl"; then
+if test "$x_zeroconf_on" = "howl"; then
        for dir in /usr/local/include /usr/local/include/howl* \
-        /usr/include /usr/include/howl*; do
+        /usr/include /usr/include/howl* \
+        /usr/local/include/avahi* /usr/include/avahi*; do
                test -d "$dir" || continue
                AC_MSG_CHECKING([for Howl headers in $dir])
                if test -f "$dir/rendezvous/rendezvous.h"; then
@@ -250,7 +348,7 @@ if test "$x_rendezvous_on" = "howl"; then
        done
        AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \
         AC_MSG_ERROR([required C header missing!]))
-       AC_DEFINE(RENDEZVOUS, 1)
+       AC_DEFINE(ZEROCONF, 1)
 fi
 
 x_identauth_on=no
@@ -325,6 +423,7 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 AC_OUTPUT([ \
        Makefile \
        doc/Makefile \
+       doc/src/Makefile \
        src/Makefile \
        src/portab/Makefile \
        src/tool/Makefile \
@@ -347,7 +446,7 @@ fi
 # -- Result --
 
 echo
-echo "ngIRCd has been configured with the following options:"
+echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:"
 echo
 
 # Someone please show me a better way :)  [borrowed by OpenSSH]
@@ -373,8 +472,8 @@ echo
 
 echo $ECHO_N "     Syslog support: $ECHO_C"
 test "$x_syslog_on" = "yes" \
-       && echo $ECHO_N "yes $ECHO_C" \
-       || echo $ECHO_N "no  $ECHO_C"
+       && echo $ECHO_N "yes   $ECHO_C" \
+       || echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "  Enable debug code: $ECHO_C"
 test "$x_debug_on" = "yes" \
        && echo "yes" \
@@ -382,8 +481,8 @@ test "$x_debug_on" = "yes" \
 
 echo $ECHO_N "   zlib compression: $ECHO_C"
 test "$x_zlib_on" = "yes" \
-       && echo $ECHO_N "yes $ECHO_C" \
-       || echo $ECHO_N "no  $ECHO_C"
+       && echo $ECHO_N "yes   $ECHO_C" \
+       || echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        IRC sniffer: $ECHO_C"
 test "$x_sniffer_on" = "yes" \
        && echo "yes" \
@@ -391,17 +490,25 @@ test "$x_sniffer_on" = "yes" \
 
 echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
 test "$x_tcpwrap_on" = "yes" \
-       && echo $ECHO_N "yes $ECHO_C" \
-       || echo $ECHO_N "no  $ECHO_C"
+       && echo $ECHO_N "yes   $ECHO_C" \
+       || echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "    Strict RFC mode: $ECHO_C"
 test "$x_strict_rfc_on" = "yes" \
        && echo "yes" \
        || echo "no"
 
-echo $ECHO_N " Rendezvous support: $ECHO_C"
-test "$x_rendezvous_on" = "osx" -o "$x_rendezvous_on" = "howl" \
-       && echo $ECHO_N "yes $ECHO_C" \
-       || echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "   Zeroconf support: $ECHO_C"
+case "$x_zeroconf_on" in
+       osx)
+               echo $ECHO_N "Apple $ECHO_C"
+               ;;
+       howl)
+               echo $ECHO_N "Howl  $ECHO_C"
+               ;;
+       *)
+               echo $ECHO_N "no    $ECHO_C"
+               ;;
+esac
 echo $ECHO_N "      IRC+ protocol: $ECHO_C"
 test "$x_ircplus_on" = "yes" \
        && echo "yes" \
@@ -409,9 +516,11 @@ test "$x_ircplus_on" = "yes" \
 
 echo $ECHO_N "      IDENT support: $ECHO_C"
 test "$x_identauth_on" = "yes" \
-       && echo $ECHO_N "yes $ECHO_C" \
-       || echo $ECHO_N "no  $ECHO_C"
+       && 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; echo
+echo
 
 # -eof-