Fix potential buffer-overflow from malformed RSFNC request.

[solanum.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 012cf9b99dd743a09bc8a6e53519d11103f1b8c5..f68652f2e4f2db295681ecbde9357b9e68f28512 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.2])
+AC_INIT([charybdis],[3.3.0])
 
 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"
@@ -1160,7 +1191,6 @@ AC_CONFIG_FILES(                  \
        bandb/Makefile                  \
        ssld/Makefile                   \
        extensions/Makefile             \
-       unsupported/Makefile            \
        src/Makefile                    \
        modules/Makefile                \
        tools/Makefile                  \
@@ -1183,7 +1213,7 @@ else
 fi
 
 echo "
-Configuration:
+Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
        Install directory  : $prefix
 
        Ziplinks           : $zlib
@@ -1195,5 +1225,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.
 "