[svn] Merge old trunk r2065,r2067:

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

diff --git a/configure.ac b/configure.ac
index f040e43a56bd84ebfa8d6b5957a095090ac82437..e0d52bded5f223e416ebaf064320d1301a1ca6f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 3356 2007-04-03 09:31:11Z nenolod $
+dnl $Id: configure.ac 3366 2007-04-03 09:57:53Z nenolod $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,7 +8,7 @@ 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 3356 2007-04-03 09:31:11Z nenolod $])
+AC_COPYRIGHT([$Id: configure.ac 3366 2007-04-03 09:57:53Z nenolod $])
 
 AC_INIT([charybdis],[2.2.0])
 
@@ -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"
@@ -655,16 +663,6 @@ AC_ARG_ENABLE(kqueue, AC_HELP_STRING([--enable-kqueue],[Force kqueue() usage.]),
   fi
 ],)
 
-AC_ARG_ENABLE(devpoll,AC_HELP_STRING([--enable-devpoll],[Force usage of /dev/poll.]),
-[ if test $enableval = yes; then 
-       SELECT_TYPE_EXPLICIT="devpoll" 
-       dnl These need to be defined or not defined
-       AC_CHECK_HEADERS([sys/devpoll.h devpoll.h])
-  else
-       use_devpoll=no;
-  fi
-],)
-
 AC_ARG_ENABLE(epoll, AC_HELP_STRING([--enable-epoll],[Force sys_epoll usage (Linux only).]),
 [ if test $enableval = yes; then 
        SELECT_TYPE_EXPLICIT="epoll"
@@ -751,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
@@ -765,17 +770,6 @@ if test ! "x$use_poll" = "xno"; then
        fi
 fi
 
-if test ! "x$use_devpoll" = "xno"; then
-       AC_MSG_CHECKING(for /dev/poll)
-       if test -c "/dev/poll"; then
-               AC_MSG_RESULT(yes)
-               AC_CHECK_HEADERS([devpoll.h sys/devpoll.h])
-               SELECT_TYPE="devpoll"
-       else
-               AC_MSG_RESULT(no)       
-       fi
-fi
-
 if test ! "x$use_kqueue" = "xno"; then
        AC_CHECK_FUNCS(kevent, [havekqueue=yes], [havekqueue=no])
        if test "x$havekqueue" = "xyes" ; then
@@ -913,19 +907,6 @@ if test "$balloc" = no; then
        AC_DEFINE([NOBALLOC], 1, [Define to 1 if you wish to disable the block allocator.])
 fi
 
-AC_ARG_ENABLE(ricer-hashing,
-AC_HELP_STRING([--enable-ricer-hashing],[Enable assembly-based hashing routines.]),
-[ricer_hashing=$enableval], [ricer_hashing=no])
-
-FNVHASH_S=""
-
-if test "$ricer_hashing" = "yes"; then
-       AC_DEFINE([RICER_HASHING], 1, [Define to 1 if you are using the assembly-based hashing routines.])
-       FNVHASH_S="fnvhash.s"
-fi
-
-AC_SUBST(FNVHASH_S)
-
 AC_ARG_ENABLE(small-net,
 AC_HELP_STRING([--enable-small-net],[Enable small network support.]),
 [small_net=$enableval], [small_net=no])