Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4c1b08a3b0fcf7fc34e3d2caf1cc9d3f8224959a..3d2610e16b541c04cf189a8b37f4382407f4e706 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 3364 2007-04-03 09:50:56Z nenolod $
+dnl $Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,9 +8,9 @@ dnl said functions need to be just about as complex as they already are.
 AC_PREREQ(2.57)
 
 dnl Sneaky way to get an Id tag into the configure script
-AC_COPYRIGHT([$Id: configure.ac 3364 2007-04-03 09:50:56Z nenolod $])
+AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([charybdis],[2.2.0])
+AC_INIT([charybdis],[2.3])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -631,6 +631,14 @@ fi
 dnl IO Loop Selection
 dnl =================
 
+AC_ARG_ENABLE(ports, AC_HELP_STRING([--enable-ports],[Force solaris I/O ports subsystem usage.]),
+[ if test $enableval = yes; then 
+       SELECT_TYPE_EXPLICIT="ports"
+  else
+       use_ports=no
+  fi
+],)
+
 AC_ARG_ENABLE(poll, AC_HELP_STRING([--enable-poll],[Force poll() usage.]),
 [ if test $enableval = yes; then 
        SELECT_TYPE_EXPLICIT="poll"
@@ -741,6 +749,13 @@ if test ! -z "$SELECT_TYPE_EXPLICIT"; then
        echo "Forcing $SELECT_TYPE to be enabled"
 else
 
+if test ! "x$use_ports" = "xno"; then
+       AC_CHECK_FUNCS(port_getn, [haveports=yes], [haveports=no])
+       if test "x$haveports" = "xyes" ; then
+               SELECT_TYPE="ports"
+       fi
+fi
+
 if test ! "x$use_select" = "xno"; then
        AC_CHECK_FUNCS(select, [haveselect=yes], [haveselect=no])
        if test "x$haveselect" = "xyes" ; then
@@ -1255,7 +1270,6 @@ Configuration:
        Socket Engine      : $SELECT_TYPE
        Small network      : $small_net
        Block allocator    : $balloc
-       ASM hashing code   : $ricer_hashing
 
        Nickname length    : $NICKLEN
        Topic length       : $TOPICLEN