Added m_remove by om, uses a force part to replace a kick to thwart auto rejoin

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index f4d71549b2cba870b17ef2a3c2da38ead8ffc80b..393943ef61b876e6c2fd468952a187191f8026b7 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,10 +7,6 @@
 #
 # $Id$
 #
-# Some shell code based on the configure script of IRC Services.
-# IRC Services is copyright (c) 1996-2002 Andrew Church. 
-# E-mail: <achurch@achurch.org>
-#
 #
 ########################################
 
@@ -18,9 +14,13 @@ echo "Configuring default values..."
 
 ME=`pwd`
 GCCVER=`gcc -dumpversion | cut -c 1`
+GCC34=`gcc -dumpversion | cut -c 3`
 CONFIG_DIR=$ME/conf
 MODULE_DIR=$ME/modules
 BINARY_DIR=$ME/bin
+INSTALL=`which install`
+OPTIMITEMP=0
+OPTIMISATI="-g"
 MAX_CLIENT_T=`ulimit -n`
 NICK_LENGT=32
 CHAN_LENGT=64
@@ -56,12 +56,12 @@ if [ "$1" = "-update" -o "$2" = "-update" ] ; then
    case "$OSNAME" in
            (FreeBSD)
                    LDLIBS="-Ldl"
-                   FLAGS="-fPIC -frtti -O3"
+                   FLAGS="-fPIC -frtti $OPTIMISATI"
                    MAKEPROG="gmake"
                    ;;
            (*)
                    LDLIBS="-ldl"
-                   FLAGS="-fPIC -frtti -O3"
+                   FLAGS="-fPIC -frtti $OPTIMISATI"
                    MAKEPROG="make"
                    ;;
    esac
@@ -86,7 +86,7 @@ fi
 
 c=""
 n=""
-if [ "`eval echo -n 'a'`" = "-n a" ] ; then
+if [ "`eval echo -e -n 'a'`" = "-n a" ] ; then
         c="\c"
 else
         n="-n"
@@ -100,6 +100,13 @@ exists () { # because some shells don't have test -e
     fi
 }
 
+echo "#include <string.h>">.test.cpp
+echo "#include <stdio.h>">>.test.cpp
+echo "int main() { char a[10]; char b[10]; strlcpy(a,b,10); printf(\"%d\\n\",999); }" >>.test.cpp
+g++ -o .test .test.cpp
+HAS_STRLCPY=`./.test`
+rm -f .test.cpp .test
+
 clear
 echo -e "'\033[1;33m####\033[0;37m:'\033[1;33m##\033[0;37m::: \033[1;33m##\033[0;37m::'\033[1;33m######\033[0;37m::'\033[1;33m########\033[0;37m::'\033[1;33m####\033[0;37m:'\033[1;33m########\033[0;37m:::'\033[1;33m######\033[0;37m::'\033[1;33m########\033[0;37m::"
 echo -e ". \033[1;33m##\033[0;37m:: \033[1;33m###\033[0;37m:: \033[1;33m##\033[0;37m:'\033[1;33m##\033[0;37m... \033[1;33m##\033[0;37m: \033[1;33m##\033[0;37m.... \033[1;33m##\033[0;37m:. \033[1;33m##\033[0;37m:: \033[1;33m##\033[0;37m.... \033[1;33m##\033[0;37m:'\033[1;33m##\033[0;37m... \033[1;33m##\033[0;37m: \033[1;33m##\033[0;37m.... \033[1;33m##\033[0;37m:"
@@ -348,6 +355,42 @@ echo ""
   echo ""
 
 ###############################################################################
+# Code Optimisation?
+
+  cheeze=0
+  echo -e "Enter the Level Of Binary optimisation. This is a number between 0 and 3 (inclusive)"
+  echo -e "The InspIRCd Team will _NOT_ support any bug reports above 0."
+  echo -e "Also note, the IRCd behaviour will be different depending on this value."
+  echo -e "Please read the documentation for more information."
+  echo -e ""
+  echo -e "The Higher the number, the more optimised your binary will be. This value will default to 0"
+  echo -e "If you either a) Dont enter a number, or b) Enter a value outside the range."
+  echo -e $n "[\033[1;32m$OPTIMITEMP\033[0;37m] -> $c"
+  read cc
+  if [ -z "$cc" ] ; then
+       cc=$OPTIMITEMP
+  fi
+  case "$cc" in
+        (1)
+                OPTIMITEMP=1
+               OPTIMISATI="-O"
+                ;;
+       (2)
+               OPTIMITEMP=2
+               OPTIMISATI="-O2"
+               ;;
+       (3)
+               OPTIMITEMP=3
+               OPTIMISATI="-O3"
+               ;;
+       (*)
+                OPTIMITEMP=0
+                OPTIMISATI="-g"
+                ;;
+  esac
+  echo ""
+
+###############################################################################
 
 
 echo -e "\033[1;32mPre-build configuration is complete!\033[0;37m"
@@ -359,10 +402,17 @@ echo -e "\033[0;37mMax User Channels\033[1;32m\t\t$MAX_CHANNE"
 echo -e "\033[0;37mMax nickname length:\033[1;32m\t\t$NICK_LENGT"
 echo -e "\033[0;37mMax channel length:\033[1;32m\t\t$CHAN_LENGT"
 echo -e "\033[0;37mMax mode length:\033[1;32m\t\t$MAXI_MODES"
-echo -e "\033[0;37mGCC Version Found:\033[1;32m\t\t$GCCVER"
+echo -e "\033[0;37mGCC Version Found:\033[1;32m\t\t$GCCVER.$GCC34"
+echo -e "\033[0;37mOptimatizaton Flag:\033[1;32m\t\t$OPTIMISATI"
 echo -e "\033[0;37m"
 
 echo "Writing cache file for future ./configures ..."
+
+if [ "$CONFIG_DIR" != "$ME/conf" ] ; then
+    COPY_CONF=1
+fi
+
+
 if [ -e ".config.cache" ] ; then
        rm .config.cache
 fi
@@ -373,8 +423,11 @@ echo "MAX_CLIENT=\"$MAX_CLIENT\"" >> .config.cache
 echo "MAX_CHANNE=\"$MAX_CHANNE\"" >> .config.cache
 echo "NICK_LENGT=\"$NICK_LENGT\"" >> .config.cache
 echo "MAXI_MODES=\"$MAXI_MODES\"" >> .config.cache 
-
-
+echo "OPTIMITEMP=\"$OPTIMITEMP\"" >> .config.cache
+echo "OPTIMISATI=\"$OPTIMISATI\"" >> .config.cache
+echo "GCC34=\"$GCC34\"" >> .config.cache
+echo "HAS_STRLCPY=\"$HAS_STRLCPY\"" >> .config.cache
+echo "COPY_CONF=\"$COPY_CONF\"" >> .config.cache
 
 echo "Writing include/inspircd_config.h ..."
 
@@ -382,6 +435,12 @@ echo "/* Auto generated by configure, do not modify! */" >include/inspircd_confi
 echo "" >>include/inspircd_config.h
 if [ "$GCCVER" -eq "3" ] ; then
 echo "#define GCC3" >>include/inspircd_config.h
+       if [ "$GCC34" -gt "3" ] ; then
+               echo "#define GCC34" >>include/inspircd_config.h
+       fi
+fi
+if [ "$HAS_STRLCPY" -eq "999" ] ; then
+       echo "#define HAS_STRLCPY" >>include/inspircd_config.h
 fi
 echo "#define SYSLOG_FACILITY LOG_DAEMON" >>include/inspircd_config.h
 echo "#define SYSLOG_LEVEL LOG_NOTICE" >>include/inspircd_config.h
@@ -393,26 +452,22 @@ echo "#define NICKMAX $NICK_LENGT" >>include/inspircd_config.h
 echo "#define CHANMAX $CHAN_LENGT" >>include/inspircd_config.h
 echo "#define MAXCHANS $MAX_CHANNE" >>include/inspircd_config.h
 echo "#define MAXMODES $MAXI_MODES" >>include/inspircd_config.h
+echo "#define OPTIMISATION $OPTIMITEMP" >>include/inspircd_config.h
 echo "#define SYSTEM \"`uname -n -s -r`\"" >>include/inspircd_config.h
 echo "#define MAXBUF 514">>include/inspircd_config.h
 touch include/inspircd_config.h
 
 echo "Preparing Variables for the Makefile"
 
-if [ "$CONFIG_DIR" != "$ME/conf" ] ; then
-    COPY_CONF=1
-fi
-
-
 case "$OSNAME" in
        (FreeBSD)
                LDLIBS="-Ldl"
-               FLAGS="-fPIC -frtti -O3"
+               FLAGS="-fPIC -frtti $OPTIMISATI"
                MAKEPROG="gmake"
                ;;
        (*)
                LDLIBS="-ldl"
-               FLAGS="-fPIC -frtti -O3"
+               FLAGS="-fPIC -frtti $OPTIMISATI"
                MAKEPROG="make"
                ;;
 esac
@@ -464,4 +519,3 @@ fi
 
 echo -e "*** \033[1;32mRemember to edit your configuration files!!!\033[0;37m ***"
 echo ""
-