X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b74f0f586ddb7f9916dea4d30a48e5ea2b4798aa..a5497589929c9482cf26b39ceab0b1a45e8462a3:/configure.ac

diff --git a/configure.ac b/configure.ac
index c18071f..6d9b2ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -927,6 +929,8 @@ dnl	AC_DEFINE([HASHSIZE], 4096, [Max number of buckets in hash tables.])
 	AC_DEFINE([ND_HEAP_SIZE], 128, [Size of the nick delay heap.])
 	AC_DEFINE([CONFITEM_HEAP_SIZE], 128, [Size of the confitem heap.])
 	AC_DEFINE([MONITOR_HEAP_SIZE], 128, [Size of the monitor heap.])
+	AC_DEFINE([FD_HEAP_SIZE], 128, [Size of fd heap.])
+	AC_DEFINE([AWAY_HEAP_SIZE], 128, [Size of away heap.])
 else
 dnl These settings are for a large network like efnet..they will use lots of memory
 dnl so enable small net unless you really need this much support
@@ -944,6 +948,8 @@ dnl so enable small net unless you really need this much support
         AC_DEFINE([ND_HEAP_SIZE], 512, [Size of the nick delay heap.])
         AC_DEFINE([CONFITEM_HEAP_SIZE], 256, [Size of the confitem heap.])
 	AC_DEFINE([MONITOR_HEAP_SIZE], 1024, [Size of the monitor heap.])
+	AC_DEFINE([FD_HEAP_SIZE], 1024, [Size of fd heap.])
+	AC_DEFINE([AWAY_HEAP_SIZE], 512, [Size of away heap.])
 fi
 
 AC_ARG_WITH(nicklen,
@@ -971,10 +977,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 +1237,6 @@ fi
 
 AC_CONFIG_FILES(			\
 	Makefile			\
-	libcharybdis/Makefile		\
 	servlink/Makefile		\
 	extensions/Makefile		\
 	unsupported/Makefile		\
@@ -1265,7 +1267,6 @@ Configuration:
 
 	Ziplinks           : $zlib
 	OpenSSL            : $openssl
-	Modules            : $modules
 	IPv6 support       : $have_v6
 	Socket Engine      : $SELECT_TYPE
 	Small network      : $small_net