simplify io_library_init*

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 204d4529817d792ae13fade6f4b0e7b06a0ec476..2381916b36d4185c91f0deba1f088c3c7c7154bd 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.116 2005/08/30 20:59:30 fw Exp $
+# $Id: configure.in,v 1.122 2006/09/16 15:00:09 fw Exp $
 #
 
 # -- Initialisation --
@@ -53,32 +53,32 @@ AC_PROG_RANLIB
 
 AM_C_PROTOTYPES
 AC_C_CONST
+AC_C_INLINE
 
 # -- Hard coded system and compiler dependencies/features/options ... --
 
-if test "$GCC" = "yes"; then
-       # We are using the GNU C compiler. Good!
-       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
+  # 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
   fi
 ])
 
-GCC_STACK_PROTECT_CC
+
+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
        hpux*)
@@ -200,6 +200,25 @@ 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(epoll,
        [  --without-epoll         disable epoll support (autodetected by default)],
        [       if test "$withval" != "no"; then
@@ -218,6 +237,7 @@ AC_ARG_WITH(epoll,
        ]
 )
 
+
 AC_ARG_WITH(kqueue,
        [  --without-kqueue        disable kqueue support (autodetected by default)],
        [       if test "$withval" != "no"; then
@@ -293,7 +313,8 @@ if test "$x_zeroconf_on" = "osx"; then
 fi
 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
@@ -481,7 +502,7 @@ test "$x_identauth_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