]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Added m_remove by om, uses a force part to replace a kick to thwart auto rejoin
[user/henk/code/inspircd.git] / configure
index 5953c2d5d98fffc313ce92ae91296c39ab3d2217..393943ef61b876e6c2fd468952a187191f8026b7 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,84 +7,86 @@
 #
 # $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..."
-mkdir fdscount
-echo "#include <sys/types.h>" >> fdscount/fdcounter.c
-echo "#include <sys/socket.h>" >> fdscount/fdcounter.c
-echo "main()" >> fdscount/fdcounter.c
-echo "{" >> fdscount/fdcounter.c
-echo "        int  i;" >> fdscount/fdcounter.c
-echo "        int  s;" >> fdscount/fdcounter.c
-echo "" >> fdscount/fdcounter.c
-echo "        for (i = 1; i <= 10000; i++)" >> fdscount/fdcounter.c
-echo "        {" >> fdscount/fdcounter.c
-echo "                s = socket(AF_INET, SOCK_STREAM, 0);" >> fdscount/fdcounter.c
-echo "                if (s < 0)" >> fdscount/fdcounter.c
-echo "                {" >> fdscount/fdcounter.c
-echo "                        printf(\"%i\", i + 2);" >> fdscount/fdcounter.c
-echo "                  exit(-1);" >> fdscount/fdcounter.c
-echo "                }" >> fdscount/fdcounter.c
-echo "        }" >> fdscount/fdcounter.c
-echo "}" >> fdscount/fdcounter.c
-
-echo "PROGS     = fdcounter" >> fdscount/Makefile
-echo "OBJS = fdcounter.o" >> fdscount/Makefile
-echo "" >> fdscount/Makefile
-echo "CC = gcc" >> fdscount/Makefile
-echo "CXXFLAGS = -fPIC -frtti -O" >> fdscount/Makefile
-echo "" >> fdscount/Makefile
-echo "all : \$(PROGS)" >> fdscount/Makefile
-echo "" >> fdscount/Makefile
-echo "\$(PROGS): \$(OBJS)" >> fdscount/Makefile
-echo " \$(CXX) -rdynamic \$^ -o \$@" >> fdscount/Makefile
-echo "" >> fdscount/Makefile
-echo ".PHONY: clean" >> fdscount/Makefile
-echo "clean:" >> fdscount/Makefile
-echo " rm -f *.o core" >> fdscount/Makefile
-
-cd fdscount
-make >> /dev/null
-cd ..
 
 ME=`pwd`
+GCCVER=`gcc -dumpversion | cut -c 1`
+GCC34=`gcc -dumpversion | cut -c 3`
 CONFIG_DIR=$ME/conf
 MODULE_DIR=$ME/modules
-MAX_CLIENT=`fdscount/fdcounter`
+BINARY_DIR=$ME/bin
+INSTALL=`which install`
+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"
 
-rm -rf fdscount
-
-if [ -z $MAX_CLIENT ] ; then
-       MAX_CLIENT=1024
+if [ -z $MAX_CLIENT_T ] ; then
+        MAX_CLIENT_T=1024
         SCAN_FAILED=1
 fi
 
+
 if [ "$1" = "-clean" -o "$2" = "-clean" ] ; then
-  CLEAN="1"
+  `rm -rf .config.cache`
 fi
 
-if [ -e "config.cache" -a -z "$CLEAN" ] ; then
-    . config.cache 
+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
 
 
 c=""
 n=""
-if [ "`eval echo -n 'a'`" = "-n a" ] ; then
+if [ "`eval echo -e -n 'a'`" = "-n a" ] ; then
         c="\c"
 else
         n="-n"
@@ -98,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:"
@@ -120,7 +129,7 @@ echo -e "Press \033[1;37m<RETURN>\033[0;37m to accept the default for any option
 echo -e "a new value. Please note: You will \033[1;37mHAVE\033[0;37m to read the docs"
 echo -e "dir, otherwise you won't have a config file!"
 echo ""
-echo -e "Your operating system is: \033[1;37m$OSNAME\033[0;37m (`uname -mnr`), fdmax: $MAX_CLIENT"
+echo -e "Your operating system is: \033[1;37m$OSNAME\033[0;37m (`uname -mnr`), fdmax: $MAX_CLIENT_T"
 echo ""
 
 #############################################################################
@@ -193,62 +202,88 @@ echo ""
     echo ""
 
 
+##############################################################################
+
+    ok=0
+    asked=1
+    echo "In what directory is the IRCd binary to be placed?"
+    while [ $ok -eq 0 ] ; do
+        echo -e $n "[\033[1;32m$BINARY_DIR\033[0;37m] -> $c"
+        if read INPUT ; then : ; else echo "" ; exit 1 ; fi
+        if [ ! "$INPUT" ] ; then
+            INPUT=$BINARY_DIR
+            default=1
+        fi
+        if echo "$INPUT" | grep -q \[\'\"\\\] ; then
+            echo 'Please use a pathname without the characters: '\'' " \'
+        elif [ ! "$NO_DIR_CHECK" -a ! -d "$INPUT" ] ; then
+            if exists "$INPUT" ; then
+                echo "$INPUT exists, but is not a directory!"
+            else
+                echo "$INPUT does not exist.  Create it?"
+                echo -e $n "[\033[1;32my\033[0;37m] $c"
+                read YN
+                if [ "$YN" != "n" ] ; then
+                    if mkdir -p "$INPUT" ; then
+                        ok=1
+                    fi
+                fi
+            fi
+            else
+            ok=1
+        fi
+    done
+    BINARY_DIR=$INPUT
+    echo ""
+
 ###############################################################################
-# Craigs Version 2 With Extra Cheeze :p
+# Craigs Version 3 With slightly less Cheeze :p
 
-  cheeze=0
-  echo -e "Maximum number of clients at any one time (\033[1;32m1-$MAX_CLIENT\033[0;37m)?"
-  while [ $cheeze -eq 0 ] ; do
+cheeze=0
+echo -e "Maximum number of clients at any one time (\033[1;32m1-$MAX_CLIENT_T\033[0;37m)?"
+while [ "$cheeze" -eq "0" ] ; do
        echo -e $n "[\033[1;32m$MAX_CLIENT\033[0;37m] -> $c"
-       read cc
-       if [ "$cc" ] ; then
-               case "$cc" in
-                       [0-9]*)
-                       if [ $cc > $MAX_CLIENT ] ; then
-                               ASK=1
-                       else
-                               MAX_CLIENT=$cc
-                       fi
-                       cheeze=1
-                       ;;
-                       *)
-                       echo ""
-                       echo "You Must Enter a Number in this field. Please Try Again."
-                       cheeze=0
-                       ;;
-               esac
-       else
-               cheeze=1
+        read cc
+
+        if [ -z "$cc" ] ; then
+               cc=$MAX_CLIENT
        fi
-       if [ $cheeze -eq 1 ] ; then
-               if [ -z $SCAN_FAILED ] ; then
-                       if [ $ASK -eq 1 ] ; then
-                               echo "WARNING: Our scans have indicated that you are"
-                               echo "         Attempting to use more sockets than"
-                               echo "         there are avaliable, do you wish to"
-                               echo "         do this? [y/n]"
-                               echo -e $n "[\033[1;32mn\033[0;37m] $c"
+
+       case "$cc" in 
+               [0-9]*)
+                       if [ "$cc" -gt "$MAX_CLIENT_T" -a -z "$SCAN_FAILED" ] ; then
+                               echo -e "WARNING: Our scans have indicated that you are attempting"
+                               echo -e "to use more sockets than there are avaliable. Are you sure"
+                               echo -e "you wish to do this? It may cause the IRCd to malfunction [y/n]"
+                               echo -e $n "[\033[1;32mn\033[0;37m] -> $c"
                                read YN
-                               if [ "$YN" == "y" ] ; then
+                               if [ "$YN" = "y" ] ; then
                                        MAX_CLIENT=$cc
+                                       cheeze=1
                                else
-                                        cheeze=0
-                                        echo ""
-                                        echo "Please Enter the Correct number of sockets:"
+                                       echo ""
+                                       echo -e "Please enter the correct value (\033[1;32m1-$MAX_CLIENT_T\033[0;37m)"
                                fi
+                       else
+                               echo $SCAN_FAILED
+                               cheeze=1
+                               MAX_CLIENT=$cc
                        fi
-               else
-                       MAX_CLIENT=$cc
-               fi
-       fi
-  done
-  echo ""
+                       ;;
+               *)
+                       echo ""
+                       echo "You must enter a number in this field. Please try again."
+                       ;;
+       esac
+done
+echo ""
+
 
 ###############################################################################
 
   cheeze=0
   echo -e "What is the Maximum length of nicknames?"
-  while [ $cheeze -eq 0 ] ; do
+  while [ "$cheeze" -eq "0" ] ; do
         echo -e $n "[\033[1;32m$NICK_LENGT\033[0;37m] -> $c"
         read cc
         if [ "$cc" ] ; then
@@ -273,7 +308,7 @@ echo ""
 
   cheeze=0
   echo -e "What is the Maximum length of channel names?"
-  while [ $cheeze -eq 0 ] ; do
+  while [ "$cheeze" -eq "0" ] ; do
         echo -e $n "[\033[1;32m$MAX_CHANNE\033[0;37m] -> $c"
         read cc
         if [ "$cc" ] ; then
@@ -298,7 +333,7 @@ echo ""
 
   cheeze=0
   echo -e "What is the Maximum number of mode changes in one line?"
-  while [ $cheeze -eq 0 ] ; do
+  while [ "$cheeze" -eq "0" ] ; do
         echo -e $n "[\033[1;32m$MAXI_MODES\033[0;37m] -> $c"
         read cc
         if [ "$cc" ] ; then
@@ -320,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"
@@ -331,25 +402,46 @@ 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.$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 [ -e "config.cache" ] ; then
-       rm config.cache
+
+if [ "$CONFIG_DIR" != "$ME/conf" ] ; then
+    COPY_CONF=1
 fi
-echo "CONFIG_DIR=\"$CONFIG_DIR\"" >> config.cache
-echo "MODULE_DIR=\"$MODULE_DIR\"" >> config.cache
-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 
 
 
+if [ -e ".config.cache" ] ; then
+       rm .config.cache
+fi
+echo "CONFIG_DIR=\"$CONFIG_DIR\"" >> .config.cache
+echo "MODULE_DIR=\"$MODULE_DIR\"" >> .config.cache
+echo "BINARY_DIR=\"$BINARY_DIR\"" >> .config.cache
+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 ..."
 
 echo "/* Auto generated by configure, do not modify! */" >include/inspircd_config.h
 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
 echo "#define CONFIG_FILE \"$CONFIG_DIR/inspircd.conf\"" >>include/inspircd_config.h
@@ -360,27 +452,39 @@ 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"
+
+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
+
 echo -e "Writing \033[1;37m$OSNAME\033[0;37m makefile"
 echo ""
 
-if exists "Makefile.$OSNAME" ; then
-       echo "Operating system supported."
-else
-       echo "Your operating system, \"$OSNAME\", is not supported!"
-       exit
-fi
+. .Makefile.inc
 
 echo ""
 
-cp -f Makefile.$OSNAME Makefile
-cp -f src/Makefile.$OSNAME src/Makefile
-cp -f src/modules/Makefile.$OSNAME src/modules/Makefile
-
 echo ""
 echo "Do you want to compile the IRCd binaries?"
 echo -e $n "[\033[1;32my\033[0;37m] $c"
@@ -390,7 +494,7 @@ if [ "$YN" != "n" ] ; then
        echo -e "\033[1;32mCompiling...\033[0;37m"
        echo ""
        cd $ME
-       make
+       $MAKEPROG
        echo ""
         echo "Done!"
         echo ""
@@ -415,4 +519,3 @@ fi
 
 echo -e "*** \033[1;32mRemember to edit your configuration files!!!\033[0;37m ***"
 echo ""
-