Fixed a little bug that would come back to bite us when gcc3.5 comes out...

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

diff --git a/configure b/configure
index 20c938b17d32b9c060b295f58748f4116e0dc587..6f54c538698fe10f28636c94cc38c82742f1fc35 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,12 +7,14 @@
 #
 # $Id$
 #
+#
 ########################################
 
 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
@@ -393,11 +395,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;37mOptimation Flag:\033[1;32m\t\t$OPTIMISATI"
+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
@@ -410,7 +418,8 @@ 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 "COPY_CONF=\"$COPY_CONF\"" >> .config.cache
 
 echo "Writing include/inspircd_config.h ..."
 
@@ -418,6 +427,9 @@ 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
 echo "#define SYSLOG_FACILITY LOG_DAEMON" >>include/inspircd_config.h
 echo "#define SYSLOG_LEVEL LOG_NOTICE" >>include/inspircd_config.h
@@ -436,11 +448,6 @@ 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"