Add away-notify client capability.

[solanum.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a4eb6033975ca752dafe215d36c806fe7e8839de..29bcfa2a4407c31f88865498f90dc2caebb33bf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([charybdis],[3.3.0])
+AC_INIT([charybdis], [3.4.0-dev])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -682,6 +682,10 @@ AC_HELP_STRING([--with-custom-version=NAME],
 AC_DEFINE_UNQUOTED(BRANDING_NAME, ["$BRANDING_NAME"], [Custom branding name.])
 AC_DEFINE_UNQUOTED(BRANDING_VERSION, ["$BRANDING_VERSION"], [Custom branding name.])
 
+if test "x$BRANDING_NAME" != "x$PACKAGE_NAME"; then
+       AC_DEFINE(CUSTOM_BRANDING, 1, [Define if custom branding is enabled.])
+fi
+
 if test ! -z "$SELECT_TYPE_EXPLICIT"; then
        SELECT_TYPE="$SELECT_TYPE_EXPLICIT";
        echo "Forcing $SELECT_TYPE to be enabled"
@@ -889,18 +893,21 @@ dnl so enable small net unless you really need this much support
 fi
 
 AC_ARG_WITH(nicklen,
-AC_HELP_STRING([--with-nicklen=LENGTH],[Set the nick length to LENGTH (default 15, max 50)]),
+AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGTH (default 31, max 50)]),
 [
   if ! expr "$withval" + 0 >/dev/null 2>&1; then 
        AC_ERROR([NICKLEN must be a numeric value])
   fi 
-  if test $withval -ge 50; then
+  if test $withval -gt 50; then
        NICKLEN=50
        AC_MSG_WARN([NICKLEN has a hard limit of 50. Setting NICKLEN=50])
+  elif test $withval -lt 9; then
+       NICKLEN=9
+       AC_MSG_WARN([NICKLEN has a lower limit of 9. Setting NICKLEN=9])
   else
        NICKLEN="$withval"
   fi
-], [NICKLEN=15])
+], [NICKLEN=31])
 
 AC_ARG_WITH(topiclen,           
 AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (default 390, max 390)]),