]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Remove <helpop file>
[user/henk/code/inspircd.git] / configure
index 8af40ef104704863db4e33310c68cd194811761b..62fd5f04f9dcdd14fcc4f1bf8f3d97e6aec03dc0 100755 (executable)
--- a/configure
+++ b/configure
@@ -12,6 +12,7 @@
 #
 ########################################
 
+
 require 5.6.0;
 use Cwd;
 use Getopt::Long;
@@ -25,7 +26,6 @@ GetOptions (
        'with-max-channels=i' => \$opt_maxchans,
        'with-max-oper-channels=i' => \$opt_opermaxchans,
        'with-max-clients' => \$opt_maxclients,
-       'enable-optimization' => \$opt_optimise,
        'enable-epoll' => \$opt_epoll,
        'enable-kqueue' => \$opt_kqueue,
        'disable-epoll' => \$opt_noepoll,
@@ -79,7 +79,6 @@ my $non_interactive = (
        (defined $opt_opermaxchans) ||
        (defined $opt_chan_length) ||
        (defined $opt_nick_length) ||
-       (defined $opt_optimise) ||
        (defined $opt_use_openssl) ||
        (defined $opt_nokqueue) ||
        (defined $opt_noepoll) ||
@@ -134,13 +133,11 @@ if (defined $opt_use_openssl)
 {
        $config{USE_OPENSSL} = "y";
 }
+
+# no, let's not change these.
 $config{OPTIMITEMP}         = "0";                                             # Default Optimisation Value
 $config{OPTIMISATI}         = "-g";                                            # Optimisation Flag
-if (defined $opt_optimise)
-{
-       $config{OPTIMISATI} = "-O" . $opt_optimise;
-       $config{OPTIMITEMP} = $opt_optimise;
-}
+
 $config{NICK_LENGT}         = "31";                                            # Default Nick Length
 if (defined $opt_nick_length)
 {
@@ -601,7 +598,7 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                        $var = $config{MAX_CLIENT};
                }
                if ($var =~ /^\d+$/) {
-                       if (($var > $config{MAX_CLIENT_T}) && ($fd_scan_failed ne true)) {
+                       if (($var > $config{MAX_CLIENT_T}) && ($fd_scan_fail ne "true")) {
                                # Client has entered a larger number than the 'discovered' value
                                # Confirm.
                                print "WARNING: Our scans have indicated that you are attempting
@@ -620,6 +617,7 @@ you wish to do this? It may cause the IRCd to malfunction [y/n]
                }
                # If we get here, we should be good to go.
                $config{MAX_CLIENT} = $var;
+               $config{MAX_DESCRIPTORS} = $var;
                $continue = 1;
                print "\n";
        }
@@ -819,37 +817,6 @@ you wish to do this? It may cause the IRCd to malfunction [y/n]
                        print "You must enter a number in this field. Please try again.\n\n";
                }
        }
-
-       # Code Optimisation
-       print "Enter the Level Of Binary optimisation. This is a number between 0 and 3.
-The InspIRCd Team will NOT support any bug reports above 0. Also note,
-the IRCd behaviour will be different depending on this value. Please
-read the documentation for more information.
-
-The higher the number, the more optimised your binary will be. This
-value will default to 0 if you either don't enter a number, or enter
-a value outside the range.
-
-As always, if you are unsure, just press enter and accept the default.\n\n";
-       print "[\033[1;32m$config{OPTIMITEMP}\033[0m] -> ";
-       chomp($var = <STDIN>);
-       if ($var eq "") {
-               $var = $config{OPTIMITEMP};
-       }
-
-       if ($var eq "1") {
-               $config{OPTIMITEMP} = 1;
-               $config{OPTIMISATI} = "-O";
-       } elsif ($var eq "2") {
-               $config{OPTIMITEMP} = 2;
-               $config{OPTIMISATI} = "-O2";
-       } elsif ($var eq "3") {
-               $config{OPTIMITEMP} = 3;
-               $config{OPTIMISATI} = "-O3";
-       } else {
-               $config{OPTIMITEMP} = 0;
-               $config{OPTIMISATI} = "-g";
-       }
 }
 
 print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
@@ -870,7 +837,8 @@ print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\033[0m\n";
 print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\033[0m\n";
 print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\033[0m\n";
 print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.x\033[0m\n";
-print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
+# and not echo it out so we don't get some ricer fuck complaining
+#print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
 print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n";
 print "\033[0mStatic modules:\033[1;32m\t\t\t$config{STATIC_LINK}\033[0m\n";
 print "\033[0mIPv6 Support:\033[1;32m\t\t\t$config{IPV6}\033[0m\n";
@@ -1675,7 +1643,7 @@ socketengine.o: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h
 hashcomp.o: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
 
-helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
 
 channels.o: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1700,7 +1668,7 @@ base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_conf
 configreader.o: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
 
-commands.o: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
+commands.o: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp $cmdobjs
 
 dynamic.o: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1808,7 +1776,7 @@ libIRCDhash.so: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
        \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
 
-libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
        \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
 
@@ -1841,7 +1809,7 @@ libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configread
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
        \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
 
-libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDcommands.so: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
        \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
 
@@ -1893,6 +1861,11 @@ sub showhelp
 {
        chomp($PWD = `pwd`);
        print "Usage: configure [options]
+
+*** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE ***
+*** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING  ***
+***     NON-INTERACTIVE CONFIGURE ON THE FORUMS OR ON IRC!    ***
+
 Options: [defaults in brackets after descriptions]
 
 When no options are specified, interactive