Removed kqueue bug fix (never released), rephrased some internal changes,

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index ef22dab56e0bb6197e24c17985d54f79c34ff092..34cb1290533827175de66e5e473b37abe0db50e0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.112 2005/07/07 18:49:58 fw Exp $
+# $Id: configure.in,v 1.117 2005/12/06 22:37:50 alex 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])
@@ -61,6 +61,25 @@ if test "$GCC" = "yes"; then
        CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
 fi
 
+
+AC_DEFUN([GCC_STACK_PROTECT_CC],[
+  ssp_cc=yes
+  if test "X$CC" != "X"; then
+    AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
+    ssp_old_cflags="$CFLAGS"
+    CFLAGS="$CFLAGS -fstack-protector"
+    AC_TRY_COMPILE(,,, ssp_cc=no)
+    echo $ssp_cc
+    if test "X$ssp_cc" = "Xno"; then
+      CFLAGS="$ssp_old_cflags"
+    else
+      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+    fi
+  fi
+])
+
+GCC_STACK_PROTECT_CC
+
 case "$target_os" in
        hpux*)
                # This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED
@@ -105,6 +124,7 @@ AC_TRY_COMPILE([
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 
+
 # -- Libraries --
 
 AC_CHECK_LIB(UTIL,memmove)
@@ -181,7 +201,7 @@ fi
 
 x_io_backend=select
 AC_ARG_WITH(epoll,
-       [  --without-epoll          disable epoll support (autodetected by default)],
+       [  --without-epoll         disable epoll support (autodetected by default)],
        [       if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -199,7 +219,7 @@ AC_ARG_WITH(epoll,
 )
 
 AC_ARG_WITH(kqueue,
-       [  --without-kqueue          disable kqueue support (autodetected by default)],
+       [  --without-kqueue        disable kqueue support (autodetected by default)],
        [       if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -246,32 +266,32 @@ int deny_severity = 0;
        ]
 )
 
-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
                test -d "$dir" || continue
@@ -290,7 +310,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
@@ -365,6 +385,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 \
@@ -413,8 +434,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" \
@@ -422,8 +443,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" \
@@ -431,17 +452,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" \
@@ -449,11 +478,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 "\"$x_io_backend()\""
 
-echo; echo
+echo
 
 # -eof-