Prevent cork usage as charybdis doesn't have its support

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

diff --git a/configure.ac b/configure.ac
index e0d52bded5f223e416ebaf064320d1301a1ca6f6..0ebc52d853d4b2967697665079b7338f0b861d09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 3366 2007-04-03 09:57:53Z 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 3366 2007-04-03 09:57:53Z 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.0])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -26,6 +26,8 @@ AC_LANG(C)
 dnl Make sure autoconf doesn't interfere with cflags -jmallett
 CFLAGS="$OLD_CFLAGS"
 
+AC_CONFIG_SUBDIRS(libratbox)
+
 dnl Check for various compilers. -jmallett
 dnl But if $CC turns out to be gcc, sure as hell it's, well, gcc. -joshk
 
@@ -796,7 +798,7 @@ main(int argc, char **argv)
         int epfd;
 
         epfd = epoll_create(256);
-        exit (epfd == -1 ? 1 : 0);
+        return (epfd == -1 ? 1 : 0);
 }, [AC_MSG_RESULT(yes)
            AC_DEFINE(HAVE_EPOLL, 1,
                [Define if your system supports the epoll system calls])
@@ -971,10 +973,7 @@ AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (def
 AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)])
 AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length])
 
-AC_ARG_ENABLE(shared-modules,
-AC_HELP_STRING([--disable-shared-modules],[ Disable shared modules.]),
-[shared_modules=$enableval], [shared_modules="yes"])
-
+shared_modules="yes"
 dnl Some first-stage sanity checks.
 if test "$shared_modules" = yes; then
        
@@ -1234,7 +1233,6 @@ fi
 
 AC_CONFIG_FILES(                       \
        Makefile                        \
-       libcharybdis/Makefile           \
        servlink/Makefile               \
        extensions/Makefile             \
        unsupported/Makefile            \
@@ -1265,12 +1263,10 @@ Configuration:
 
        Ziplinks           : $zlib
        OpenSSL            : $openssl
-       Modules            : $modules
        IPv6 support       : $have_v6
        Socket Engine      : $SELECT_TYPE
        Small network      : $small_net
        Block allocator    : $balloc
-       ASM hashing code   : $ricer_hashing
 
        Nickname length    : $NICKLEN
        Topic length       : $TOPICLEN