configure: no more small-net

This commit is contained in:
William Pitcock 2016-01-08 07:09:47 -06:00
parent 9e45a5ca19
commit 190a59706e
2 changed files with 16 additions and 105 deletions

62
configure vendored
View file

@ -853,7 +853,6 @@ enable_assert
enable_iodebug
enable_profile
enable_balloc
enable_small_net
with_nicklen
with_topiclen
enable_warnings
@ -1515,7 +1514,6 @@ Optional Features:
--enable-iodebug Enable IO Debugging hooks
--enable-profile Enable profiling
--disable-balloc Disable the block allocator.
--enable-small-net Enable small network support.
--enable-warnings Enable all sorts of warnings for debugging.
Optional Packages:
@ -16541,64 +16539,6 @@ $as_echo "#define NOBALLOC 1" >>confdefs.h
fi
# Check whether --enable-small-net was given.
if test "${enable_small_net+set}" = set; then :
enableval=$enable_small_net; small_net=$enableval
else
small_net=no
fi
if test "$small_net" = yes; then
$as_echo "#define NICKNAMEHISTORYLENGTH 1500" >>confdefs.h
$as_echo "#define CHANNEL_HEAP_SIZE 256" >>confdefs.h
$as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
$as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define PCLIENT_HEAP_SIZE 32" >>confdefs.h
$as_echo "#define USER_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
$as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
$as_echo "#define LINEBUF_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define MEMBER_HEAP_SIZE 256" >>confdefs.h
$as_echo "#define ND_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define CONFITEM_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define MONITOR_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define FD_HEAP_SIZE 128" >>confdefs.h
$as_echo "#define AWAY_HEAP_SIZE 128" >>confdefs.h
else
$as_echo "#define NICKNAMEHISTORYLENGTH 15000" >>confdefs.h
@ -16647,7 +16587,6 @@ $as_echo "#define FD_HEAP_SIZE 1024" >>confdefs.h
$as_echo "#define AWAY_HEAP_SIZE 512" >>confdefs.h
fi
# Check whether --with-nicklen was given.
@ -20369,7 +20308,6 @@ Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
Ziplinks : $zlib
OpenSSL : $openssl
Small network : $small_net
Block allocator : $balloc
Nickname length : $NICKLEN

View file

@ -546,48 +546,22 @@ if test "$balloc" = no; then
AC_DEFINE([NOBALLOC], 1, [Define to 1 if you wish to disable the block allocator.])
fi
AC_ARG_ENABLE(small-net,
AC_HELP_STRING([--enable-small-net],[Enable small network support.]),
[small_net=$enableval], [small_net=no])
if test "$small_net" = yes; then
dnl AC_DEFINE([HASHSIZE], 4096, [Max number of buckets in hash tables.])
AC_DEFINE([NICKNAMEHISTORYLENGTH], 1500, [Size of the WHOWAS array.])
AC_DEFINE([CHANNEL_HEAP_SIZE], 256, [Size of the channel heap.])
AC_DEFINE([BAN_HEAP_SIZE], 128, [Size of the ban heap.])
AC_DEFINE([CLIENT_HEAP_SIZE], 256, [Size of the client heap.])
AC_DEFINE([LCLIENT_HEAP_SIZE], 128, [Size of the local client heap.])
AC_DEFINE([PCLIENT_HEAP_SIZE], 32, [Size of the pre-client heap.])
AC_DEFINE([USER_HEAP_SIZE], 128, [Size of the user heap.])
AC_DEFINE([DNODE_HEAP_SIZE], 256, [Size of the dlink_node heap.])
AC_DEFINE([TOPIC_HEAP_SIZE], 256, [Size of the topic heap.])
AC_DEFINE([LINEBUF_HEAP_SIZE], 128, [Size of the linebuf heap.])
AC_DEFINE([MEMBER_HEAP_SIZE], 256, [Sizeof member heap.])
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
AC_DEFINE([NICKNAMEHISTORYLENGTH], 15000, [Size of the WHOWAS array.])
AC_DEFINE([CHANNEL_HEAP_SIZE], 8192, [Size of the channel heap.])
AC_DEFINE([BAN_HEAP_SIZE], 4096, [Size of the ban heap.])
AC_DEFINE([CLIENT_HEAP_SIZE], 8192, [Size of the client heap.])
AC_DEFINE([LCLIENT_HEAP_SIZE], 1024, [Size of the local client heap.])
AC_DEFINE([PCLIENT_HEAP_SIZE], 256, [Size of the pre-client heap.])
AC_DEFINE([USER_HEAP_SIZE], 8192, [Size of the user heap.])
AC_DEFINE([DNODE_HEAP_SIZE], 8192, [Size of the dlink_node heap.])
AC_DEFINE([TOPIC_HEAP_SIZE], 4096, [Size of the topic heap.])
AC_DEFINE([LINEBUF_HEAP_SIZE], 2048, [Size of the linebuf heap.])
AC_DEFINE([MEMBER_HEAP_SIZE], 32768, [Sizeof member heap.])
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_DEFINE([NICKNAMEHISTORYLENGTH], 15000, [Size of the WHOWAS array.])
AC_DEFINE([CHANNEL_HEAP_SIZE], 8192, [Size of the channel heap.])
AC_DEFINE([BAN_HEAP_SIZE], 4096, [Size of the ban heap.])
AC_DEFINE([CLIENT_HEAP_SIZE], 8192, [Size of the client heap.])
AC_DEFINE([LCLIENT_HEAP_SIZE], 1024, [Size of the local client heap.])
AC_DEFINE([PCLIENT_HEAP_SIZE], 256, [Size of the pre-client heap.])
AC_DEFINE([USER_HEAP_SIZE], 8192, [Size of the user heap.])
AC_DEFINE([DNODE_HEAP_SIZE], 8192, [Size of the dlink_node heap.])
AC_DEFINE([TOPIC_HEAP_SIZE], 4096, [Size of the topic heap.])
AC_DEFINE([LINEBUF_HEAP_SIZE], 2048, [Size of the linebuf heap.])
AC_DEFINE([MEMBER_HEAP_SIZE], 32768, [Sizeof member heap.])
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.])
AC_ARG_WITH(nicklen,
AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGTH (default 31, max 50)]),
@ -722,7 +696,6 @@ Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
Ziplinks : $zlib
OpenSSL : $openssl
Small network : $small_net
Block allocator : $balloc
Nickname length : $NICKLEN