X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=11c146085a5691652fde8e9d9acffbbff5e390c0;hb=0f781e55b0bccde1e0aade19065d9ef10a05682a;hp=eccddf5fd4b935d974da1b197e1fdd25ed5150e6;hpb=595091ca4330e079a76cc35fd304e74f2e4273f6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index eccddf5fd..11c146085 100755
--- a/configure
+++ b/configure
@@ -7,15 +7,8 @@
 #
 # $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>
-#
-#
 ########################################
 
-# echo -e "\033[1;37mtest\033[0;37m"
-
 echo "Configuring default values..."
 
 ME=`pwd`
@@ -23,11 +16,14 @@ GCCVER=`gcc -dumpversion | cut -c 1`
 CONFIG_DIR=$ME/conf
 MODULE_DIR=$ME/modules
 BINARY_DIR=$ME/bin
+OPTIMITEMP=0
+OPTIMISATI="-g"
 MAX_CLIENT_T=`ulimit -n`
 NICK_LENGT=32
 CHAN_LENGT=64
 MAX_CHANNE=20
 MAXI_MODES=20
+OSNAME=`(uname -s) 2>/dev/null` || OSNAME="unknown"
 
 if [ -z $MAX_CLIENT_T ] ; then
         MAX_CLIENT_T=1024
@@ -43,7 +39,43 @@ if [ -e ".config.cache" -a -z "$CLEAN" ] ; then
     . .config.cache 
 fi
 
-OSNAME=`(uname -s) 2>/dev/null` || OSNAME="unknown"
+if [ "$1" = "-update" -o "$2" = "-update" ] ; then
+   # They wanna update their Makefile.. good for 'em
+   # Make sure .config.cache exists
+   if [ ! -e ".config.cache" ] ; then
+     echo "You have not run ./configure before. Please do this before trying to run the update script."
+     exit 0
+   fi
+   # Right, load the cache values
+   . .config.cache
+   # Check for modules
+
+   case "$OSNAME" in
+           (FreeBSD)
+                   LDLIBS="-Ldl"
+                   FLAGS="-fPIC -frtti $OPTIMISATI"
+                   MAKEPROG="gmake"
+                   ;;
+           (*)
+                   LDLIBS="-ldl"
+                   FLAGS="-fPIC -frtti $OPTIMISATI"
+                   MAKEPROG="make"
+                   ;;
+   esac
+
+   MODULES=""
+   for module in src/modules/*.cpp ; do
+           mod=`echo $module | sed 's/.cpp/.so/' | sed 's/src\/modules\///'`
+           MODULES="$MODULES $mod"
+   done
+
+   # Write the new makefile.
+   . .Makefile.inc
+   echo "Complete."
+   exit 1; 
+fi
+
+
 if [ -z $MAX_CLIENT ] ; then
         MAX_CLIENT=$MAX_CLIENT_T
 fi
@@ -313,6 +345,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"
@@ -325,6 +393,7 @@ 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;37mOptimation Flag:\033[1;32m\t\t$OPTIMISATI"
 echo -e "\033[0;37m"
 
 echo "Writing cache file for future ./configures ..."
@@ -338,7 +407,8 @@ 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 "Writing include/inspircd_config.h ..."
@@ -358,6 +428,7 @@ 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
@@ -372,12 +443,12 @@ 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