X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/2723453983ce8aa8b808a0452c9acffc76cda194..c5bbc6037579a3c4b72b2a9910138950c628a8d8:/configure.ac

diff --git a/configure.ac b/configure.ac
index fa38d0ea..29bcfa2a 100644
--- 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.1.0])
+AC_INIT([charybdis], [3.4.0-dev])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -655,6 +655,37 @@ AC_HELP_STRING([--with-moduledir=DIR],
 	  	 AC_SUBST_DIR([moduledir])]
 )
 
+dnl **********************************************************************
+dnl Branding
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether custom branding is requested])
+AC_ARG_WITH(custom-branding,
+AC_HELP_STRING([--with-custom-branding=NAME],
+	       [Custom branding name.]),
+	       [BRANDING_NAME=$withval
+		AC_MSG_RESULT([yes])],
+	       [BRANDING_NAME=$PACKAGE_NAME
+		AC_MSG_RESULT([no])]
+)
+
+AC_MSG_CHECKING([whether a custom version is requested])
+AC_ARG_WITH(custom-version,
+AC_HELP_STRING([--with-custom-version=NAME],
+	       [Custom version branding.]),
+	       [BRANDING_VERSION=$withval
+		AC_MSG_RESULT([yes])],
+	       [BRANDING_VERSION=$PACKAGE_VERSION
+		AC_MSG_RESULT([no])]
+)
+
+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"
@@ -862,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)]),
@@ -1050,12 +1084,10 @@ CHARYBDIS_C_GCC_TRY_FLAGS([-Wmissing-noreturn], charybdis_cv_c_gcc_w_missing_nor
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wundef], charybdis_cv_c_gcc_w_undef)
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wpacked], charybdis_cv_c_gcc_w_packed)
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wnested-externs], charybdis_cv_c_gcc_w_nested_externs)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wbad-function-cast], charybdis_cv_c_gcc_w_bad_function_cast)
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], charybdis_cv_c_gcc_w_unused)
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wredundant-decls], charybdis_cv_c_gcc_w_redundant_decls)
 CHARYBDIS_C_GCC_TRY_FLAGS([-Wfloat-equal], charybdis_cv_c_gcc_w_float_equal)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wformat-security], charybdis_cv_c_gcc_w_format)
-CHARYBDIS_C_GCC_TRY_FLAGS([-pedantic], charybdis_cv_c_gcc_pedantic)
+CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], charybdis_cv_c_gcc_w_format)
 
 IRC_CFLAGS="$CFLAGS"
 ],[])
@@ -1159,9 +1191,9 @@ fi
 
 AC_CONFIG_FILES(			\
 	Makefile			\
+	bandb/Makefile			\
 	ssld/Makefile			\
 	extensions/Makefile		\
-	unsupported/Makefile		\
 	src/Makefile			\
 	modules/Makefile		\
 	tools/Makefile			\
@@ -1184,7 +1216,7 @@ else
 fi
 
 echo "
-Configuration:
+Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
 	Install directory  : $prefix
 
 	Ziplinks           : $zlib
@@ -1196,5 +1228,5 @@ Configuration:
 	Nickname length    : $NICKLEN
 	Topic length       : $TOPICLEN
 
-Use (g)make to compile Charybdis, then (g)make install to install it.
+Use (g)make to compile $BRANDING_NAME, then (g)make install to install it.
 "