io.c: fix select FD_SETSIZE check when using epoll as io backend

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 9b2c7128fa259c642d4d199b665a8380ca6a6a7d..d17bc15e922d2b6bd043cfb9d9c93f763f23a6a8 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.124 2006/10/02 21:57:13 fw Exp $
+# $Id: configure.in,v 1.126 2008/02/26 22:04:15 fw Exp $
 #
 
 # -- Initialisation --
@@ -30,6 +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([WANT_IPV6], [Define if IPV6 protocol should be enabled])
 AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included])
 AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
@@ -143,12 +144,10 @@ AC_CHECK_FUNCS([ \
 
 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!])
-)
-
 # -- Configuration options --
 
+# use syslog?
+
 x_syslog_on=no
 AC_ARG_WITH(syslog,
        [  --without-syslog        disable syslog (autodetected by default)],
@@ -174,6 +173,8 @@ if test "$x_syslog_on" = "yes"; then
        AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# use zlib compression?
+
 x_zlib_on=no
 AC_ARG_WITH(zlib,
        [  --without-zlib          disable zlib compression (autodetected by default)],
@@ -198,8 +199,28 @@ if test "$x_zlib_on" = "yes"; then
        AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# detect which IO API to use:
+
+x_io_backend=none
+
+AC_ARG_WITH(select,
+       [  --without-select        disable select IO 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(select, x_io_select=yes,
+                               AC_MSG_ERROR([Can't enable select IO support!])
+                       )
+               fi
+       ],
+       [
+               AC_CHECK_FUNCS(select, x_io_select=yes)
+       ]
+)
 
-x_io_backend=select\(\)
 AC_ARG_WITH(poll,
        [  --without-poll          disable poll support (autodetected by default)],
        [       if test "$withval" != "no"; then
@@ -209,7 +230,7 @@ AC_ARG_WITH(poll,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
-                               AC_MSG_ERROR([Can't enable poll support!])
+                               AC_MSG_ERROR([Can't enable poll IO support!])
                        )
                fi
        ],
@@ -218,9 +239,8 @@ AC_ARG_WITH(poll,
        ]
 )
 
-
 AC_ARG_WITH(devpoll,
-       [  --without-devpoll          disable /dev/poll support (autodetected by default)],
+       [  --without-devpoll       disable /dev/poll IO support (autodetected by default)],
        [       if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -232,31 +252,30 @@ AC_ARG_WITH(devpoll,
                fi
        ],
        [
-               AC_CHECK_HEADERS(sys/devpoll.h,x_io_backend=/dev/poll,)
+               AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll)
        ]
 )
 
 AC_ARG_WITH(epoll,
-       [  --without-epoll         disable epoll support (autodetected by default)],
+       [  --without-epoll         disable epoll IO 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!])
+                       AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes,
+                               AC_MSG_ERROR([Can't enable epoll IO support!])
                        )
                fi
        ],
        [
-               AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\))
+               AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
        ]
 )
 
-
 AC_ARG_WITH(kqueue,
-       [  --without-kqueue        disable kqueue support (autodetected by default)],
+       [  --without-kqueue        disable kqueue IO support (autodetected by default)],
        [       if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -264,7 +283,7 @@ AC_ARG_WITH(kqueue,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
-                               AC_MSG_ERROR([Can't enable kqueue support!])
+                               AC_MSG_ERROR([Can't enable kqueue IO support!])
                        )
                fi
        ],
@@ -273,6 +292,27 @@ AC_ARG_WITH(kqueue,
        ]
 )
 
+if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then
+       # when epoll() and select() are available, we'll use both!
+       x_io_backend="epoll(), select()"
+else
+       if test "$x_io_epoll" = "yes"; then
+               # we prefere epoll() if it is available
+               x_io_backend="epoll()"
+       else
+               if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then
+                       # we'll use select, when available and no "better"
+                       # interface has been detected ...
+                       x_io_backend="select()"
+               fi
+       fi
+fi
+
+if test "$x_io_backend" = "none"; then
+       AC_MSG_ERROR([No useabe IO API activated/found!?])
+fi
+
+# use TCP wrappers?
 
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
@@ -303,6 +343,8 @@ int deny_severity = 0;
        ]
 )
 
+# include support for "zeroconf"?
+
 x_zeroconf_on=no
 AC_ARG_WITH(zeroconf,
        [  --with-zeroconf         enable support for "Zeroconf"],
@@ -351,6 +393,8 @@ if test "$x_zeroconf_on" = "howl"; then
        AC_DEFINE(ZEROCONF, 1)
 fi
 
+# do IDENT requests using libident?
+
 x_identauth_on=no
 AC_ARG_WITH(ident,
        [  --with-ident            enable "IDENT" ("AUTH") protocol support],
@@ -372,6 +416,8 @@ if test "$x_identauth_on" = "yes"; then
        AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# compile in IRC+ protocol support?
+
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
        [  --disable-ircplus       disable IRC+ protocol],
@@ -381,6 +427,21 @@ if test "$x_ircplus_on" = "yes"; then
        AC_DEFINE(IRCPLUS, 1)
 fi
 
+# enable support for IPv6?
+x_ipv6_on=no
+AC_ARG_ENABLE(ipv6,
+       [  --enable-ipv6,       enable IPv6 protocol support],
+       if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
+)
+if test "$x_ipv6_on" = "yes"; then
+       AC_CHECK_FUNCS([ \
+               getaddrinfo getnameinfo \
+               ],,AC_MSG_ERROR([required function missing for IPv6 support!]))
+       AC_DEFINE(WANT_IPV6, 1)
+fi
+
+# compile in IRC "sniffer"?
+
 x_sniffer_on=no; x_debug_on=no
 AC_ARG_ENABLE(sniffer,
        [  --enable-sniffer        enable IRC traffic sniffer (enables debug mode)],
@@ -390,6 +451,8 @@ AC_ARG_ENABLE(sniffer,
        fi
 )
 
+# enable additional debugging code?
+
 AC_ARG_ENABLE(debug,
        [  --enable-debug          show additional debug output],
        if test "$enableval" = "yes"; then x_debug_on=yes; fi
@@ -399,6 +462,8 @@ if test "$x_debug_on" = "yes"; then
        test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
 fi
 
+# enable "strict RFC rules"?
+
 x_strict_rfc_on=no
 AC_ARG_ENABLE(strict-rfc,
        [  --enable-strict-rfc     strict RFC conformance -- may break clients!],
@@ -426,6 +491,7 @@ AC_OUTPUT([ \
        doc/src/Makefile \
        src/Makefile \
        src/portab/Makefile \
+       src/ipaddr/Makefile \
        src/tool/Makefile \
        src/ngircd/Makefile \
        src/testsuite/Makefile \
@@ -521,6 +587,8 @@ test "$x_identauth_on" = "yes" \
 echo $ECHO_N "        I/O backend: $ECHO_C"
        echo "\"$x_io_backend\""
 
+echo $ECHO_N "      IPv6 protocol: $ECHO_C"
+echo "$x_ipv6_on"
 echo
 
 # -eof-