Removed reference to depricated ./makeconf and updated command to exec to build the...

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

diff --git a/configure b/configure
index cc603917b2260ab388a730bebbf585bae1798049..f8528dc13101de6375b51dac5ee758d17b076b96 100755 (executable)
--- a/configure
+++ b/configure
@@ -54,12 +54,12 @@ if [ "$1" = "-update" -o "$2" = "-update" ] ; then
    # Check for modules
 
    case "$OSNAME" in
-           (FreeBSD)
+           FreeBSD)
                    LDLIBS="-Ldl"
                    FLAGS="-fPIC -frtti $OPTIMISATI"
                    MAKEPROG="gmake"
                    ;;
-           (*)
+           *)
                    LDLIBS="-ldl"
                    FLAGS="-fPIC -frtti $OPTIMISATI"
                    MAKEPROG="make"
@@ -73,7 +73,19 @@ if [ "$1" = "-update" -o "$2" = "-update" ] ; then
    done
 
    # Write the new makefile.
-   . .Makefile.inc
+   for file in Makefile; do
+          echo -e "\033[0;37mWriting \033[1;32m$file\033[0;37m"
+          rm -f $file
+          sed -e "
+                  s%@MAKEPROG@%$MAKEPROG%g
+                  s%@FLAGS@%$FLAGS%g
+                  s%@LDLIBS@%$LDLIBS%g
+                  s%@CONFIG_DIR@%$CONFIG_DIR%g
+                  s%@MODULE_DIR@%$MODULE_DIR%g
+                  s%@BINARY_DIR@%$BINARY_DIR%g
+                  s%@MODULES@%$MODULES%g
+          " .${file}.inc >> $file
+   done
    echo "Complete."
    exit 1; 
 fi
@@ -371,19 +383,19 @@ echo ""
        cc=$OPTIMITEMP
   fi
   case "$cc" in
-        (1)
+        1)
                 OPTIMITEMP=1
                OPTIMISATI="-O"
                 ;;
-       (2)
+       2)
                OPTIMITEMP=2
                OPTIMISATI="-O2"
                ;;
-       (3)
+       3)
                OPTIMITEMP=3
                OPTIMISATI="-O3"
                ;;
-       (*)
+       *)
                 OPTIMITEMP=0
                 OPTIMISATI="-g"
                 ;;
@@ -430,7 +442,7 @@ 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 ..."
+echo -e "Writing \033[1;32minspircd_config.h"
 
 echo "/* Auto generated by configure, do not modify! */" >include/inspircd_config.h
 echo "" >>include/inspircd_config.h
@@ -458,15 +470,13 @@ 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"
-
 case "$OSNAME" in
-       (FreeBSD)
+       FreeBSD)
                LDLIBS="-Ldl"
                FLAGS="-fPIC -frtti $OPTIMISATI"
                MAKEPROG="gmake"
                ;;
-       (*)
+       *)
                LDLIBS="-ldl"
                FLAGS="-fPIC -frtti $OPTIMISATI"
                MAKEPROG="make"
@@ -479,10 +489,21 @@ for module in src/modules/*.cpp ; do
        MODULES="$MODULES $mod" 
 done
 
-echo -e "Writing \033[1;37m$OSNAME\033[0;37m makefile"
-echo ""
+for file in Makefile inspircd; do
+       echo -e "\033[0;37mWriting \033[1;32m$file\033[0;37m"
+       rm -f $file
+       sed -e "
+               s%@MAKEPROG@%$MAKEPROG%g
+               s%@FLAGS@%$FLAGS%g
+               s%@LDLIBS@%$LDLIBS%g
+               s%@CONFIG_DIR@%$CONFIG_DIR%g
+               s%@MODULE_DIR@%$MODULE_DIR%g
+               s%@BINARY_DIR@%$BINARY_DIR%g
+               s%@MODULES@%$MODULES%g
+       " .${file}.inc >> $file
+done
 
-. .Makefile.inc
+`chmod 700 inspircd`
 
 echo ""
 
@@ -498,25 +519,12 @@ if [ "$YN" != "n" ] ; then
        $MAKEPROG
        echo ""
         echo "Done!"
-        echo ""
 else
        echo ""
-       echo "Done!"
-       echo ""
-       echo -e "To build your server with these settings, please type '\033[1;32mmake\033[0;37m' now."
-       echo ""
-       echo -e "*** \033[1;32mRemember to edit your configuration files!!!\033[0;37m ***"
-       echo ""
+       echo -e "To build your server with these settings, please type '\033[1;32m$MAKEPROG\033[0;37m' now."
 fi
 
 
 echo ""
-echo "Do you want to run the config file maker?"
-echo -e $n "[\033[1;32my\033[0;37m] $c"
-read YN
-if [ "$YN" != "n" ] ; then
-       sh makeconf
-fi
-
 echo -e "*** \033[1;32mRemember to edit your configuration files!!!\033[0;37m ***"
 echo ""