]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
This now works properly with $NoPedantic macro.
[user/henk/code/inspircd.git] / configure
index f34a903429dbf45897d68b21dd5ec14c14b84242..b5a0f7cf5fdb5a3508b5cf40c2fe40b6cc16df8e 100755 (executable)
--- a/configure
+++ b/configure
@@ -24,63 +24,10 @@ use make::gnutlscert;
 use make::opensslcert;
 
 ###############################################################################################
-
-# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
-# whos file extension is omitted (these can vary from system to system).
-
-my %filelist = (
-       "channels.cpp"      =>      "libIRCDchannels",
-       "mode.cpp"          =>      "libIRCDmode",
-       "xline.cpp"         =>      "libIRCDxline",
-       "inspstring.cpp"    =>      "libIRCDstring",
-       "dns.cpp"           =>      "libIRCDasyncdns",
-       "base.cpp"          =>      "libIRCDbase",
-       "configreader.cpp"  =>      "libIRCDconfigreader",
-       "inspsocket.cpp"    =>      "libIRCDinspsocket",
-       "commands.cpp"      =>      "libIRCDcommands",
-       "dynamic.cpp"       =>      "libIRCDdynamic",
-       "users.cpp"         =>      "libIRCDusers",
-       "modules.cpp"       =>      "libIRCDmodules",
-       "wildcard.cpp"      =>      "libIRCDwildcard",
-       "helperfuncs.cpp"   =>      "libIRCDhelper",
-       "hashcomp.cpp"      =>      "libIRCDhash",
-       "socket.cpp"        =>      "libIRCDsocket",
-       "socketengine.cpp"  =>      "libIRCDsocketengine",
-       "userprocess.cpp"   =>      "libIRCDuserprocess",
-       "cull_list.cpp"     =>      "libIRCDcull_list",
-       "command_parse.cpp" =>      "libIRCDcommand_parse",
-       "timer.cpp"         =>      "libIRCDtimer",
-       "snomasks.cpp"      =>      "libIRCDsnomasks",
-       "server.cpp"        =>      "libIRCDserver",
-       "filelogger.cpp"    =>      "libIRCDfilelogger",
-       "user_resolver.cpp" =>      "libIRCDuserresolver",
-);
-
-# If you wish for a file to have special dependencies in the makefile, add an entry here.
-
-my %specialdeps = (
-       "mode.cpp"      =>      "\$(RELCPPFILES)",
-);
-
-# If you wish for a file to have extra make lines (in between the compile and link steps)
-# then insert them here.
-       
-my %extrabuildlines = (
-       "mode.cpp"      =>      "\${MAKE} -C \"modes\" DIRNAME=\"src/modes\" CC=\"\$(CC)\" \$(MAKEARGS) CPPFILES=\"\$(CPPFILES)\"",
-);
-
-# If you wish for a file to be linked against extra objects or arctives, insert them here.
-
-my %extraobjects = (
-       "mode.cpp"      =>      "modes/modeclasses.a"
-);
-
-# If you wish to compile extra cpp sources into an object, define them here.
-# NOTE: Certain cpp files such as the socket engines have a value auto calculated
-# for this table so that their derived class is built.
-
-my %extrasources = (
-);
+#
+#                                   EDITABLE VARIABLES
+#
+###############################################################################################
 
 # If you wish to ignore a dependency throughout the entire core, add it here.
 
@@ -96,8 +43,44 @@ my @immutabledeps = (
        "inspircd.h",
 );
 
-
 ###############################################################################################
+#
+#                                 NON-EDITABLE VARIABLES
+#
+###############################################################################################
+
+# List of commands that make up 'make install'
+
+my $install_list = "";
+
+# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
+# whos file extension is omitted (these can vary from system to system). Auto detected by
+# scanning the src/*.cpp files for files containing /* $Core: */ identifiers.
+
+my %filelist = ();
+
+# If you wish for a file to have special dependencies in the makefile, add an entry here.
+# Auto populated by /* $ExtraDeps: */ instruction
+
+my %specialdeps = ();
+
+# If you wish for a file to have extra make lines (in between the compile and link steps)
+# then insert them here.
+# Auto populated by /* $ExtraBuild: */ instruction
+        
+my %extrabuildlines = ();
+
+# If you wish for a file to be linked against extra objects or arctives, insert them here.
+# Auto populated by /* $ExtraObjects: */ instruction
+
+my %extraobjects = ();
+
+# If you wish to compile extra cpp sources into an object, define them here.
+# NOTE: Certain cpp files such as the socket engines have a value auto calculated
+# for this table so that their derived class is built.
+# Auto populated by /* $ExtraSources: */ instruction
+
+my %extrasources = ();
 
 
 GetOptions (
@@ -1024,13 +1007,13 @@ sub dir_check {
 sub getosflags {
 
        $config{LDLIBS} = "-lstdc++";
-       $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
-       $config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated -g";
+       $config{FLAGS}  = "-fPIC -W -pedantic $config{OPTIMISATI}";
+       $config{DEVELOPER} = "-fPIC -W -pedantic -g";
        $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
        $config{MAKEPROG} = "make";
 
        if ($config{OSNAME} =~ /darwin/i) {
-               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -W -pedantic $config{OPTIMISATI}";
                $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
                $config{LDLIBS} = "-ldl -lstdc++";
        }
@@ -1051,7 +1034,7 @@ sub getosflags {
 
        if ($config{OSNAME} =~ /Linux/i) {
                $config{LDLIBS} = "-ldl -lstdc++";
-               $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+               $config{FLAGS}  = "-fPIC -W -pedantic $config{OPTIMISATI}";
                $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
                $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
                $config{MAKEPROG} = "make";
@@ -1216,8 +1199,6 @@ EOF
        my $file = "";
        my $exe = "inspircd";
 
-       opendir(DIRHANDLE, $this);
-
        # Do this once here, and cache it in the .*.inc files,
        # rather than attempting to read src/version.sh from
        # compiled code -- we might not have the source to hand.
@@ -1227,14 +1208,15 @@ EOF
        chomp(my $revision = getrevision());
        $version = "$version(r$revision)";
 
-       my $LIBEXT = "so";
-       if ($config{IS_DARWIN} eq "YES")
-       {
-               $LIBEXT = "dylib";
-       }
        # We can actually parse any file starting with . and ending with .inc,
        # but right now we only parse .inspircd.inc to form './inspircd'
 
+        print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
+       write_dynamic_makefile();
+       write_dynamic_modules_makefile();
+
+       opendir(DIRHANDLE, $this);
+
        foreach $name (sort readdir(DIRHANDLE)) {
                if ($name =~ /^\.(.+)\.inc$/) {
                        $file = $1;
@@ -1244,12 +1226,13 @@ EOF
 
                        # All .name.inc files need parsing!
                        $tmp = "";
-                       open(FILEHANDLE, ".$file.inc");
+                       open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc");
                        while (<FILEHANDLE>) {
                                $tmp .= $_;
                        }
                        close(FILEHANDLE);
 
+                       print "Writing \033[1;32m$file\033[0m ...\n";
                        $tmp =~ s/\@CC\@/$config{CC}/;
                        $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
                        $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
@@ -1260,7 +1243,6 @@ EOF
                        $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
                        $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
                        $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
-                       $tmp =~ s/\@LIBRARY_EXT\@/$LIBEXT/;
                        $tmp =~ s/\@MODULES\@/$modules/;
                        $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/;
                        $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/;
@@ -1268,8 +1250,8 @@ EOF
                        $tmp =~ s/\@EXECUTABLE\@/$exe/;
                        $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
                        $tmp =~ s/\@VERSION\@/$version/;
+                       $tmp =~ s/\@INSTALL_LIST\@/$install_list/;
 
-                       print "Writing \033[1;32m$file\033[0m\n";
                        open(FILEHANDLE, ">$file");
                        print FILEHANDLE $tmp;
                }
@@ -1278,10 +1260,6 @@ EOF
 
        # Make inspircd executable!
        chmod 0744, 'inspircd';
-
-       print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
-       write_dynamic_makefile();
-       write_dynamic_modules_makefile();
 }
 
 sub write_dynamic_modules_makefile {
@@ -1311,13 +1289,13 @@ EOF
 if ($config{OSNAME} =~ /darwin/) {
                print FILEHANDLE <<EOCHEESE;
 
-PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
 
 EOCHEESE
 } else {
                print FILEHANDLE <<EOCHEESE;
 
-PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
+PICLDFLAGS = -fPIC -DPIC -shared
 
 EOCHEESE
 }
@@ -1342,10 +1320,24 @@ EOCHEESE
        
                #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
        
-               print FILEHANDLE <<EOCHEESE;
+
+               $nicerflags = $config{FLAGS};
+               $nicerflags =~ s/-pedantic//g;
+
+               if (nopedantic("src/modules/m_".$i.".cpp"))
+               {
+                       print FILEHANDLE "
+m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
+       \$(CC) -pipe -I../../include $nicerflags $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+"
+               }
+               else
+               {
+                       print FILEHANDLE "
 m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
        \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
-EOCHEESE
+";
+               }
                $crud = $crud . "       install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
 ###
                # End Write Entry to the MakeFile
@@ -1444,31 +1436,82 @@ sub calcdeps($)
        return length($immutable) ? $immutable . " " . $retlist : $retlist;
 }
 
-sub write_dynamic_makefile {
-
+sub write_dynamic_makefile
+{
        my $i = 0;
        my @cmdlist = ();
        opendir(DIRHANDLE, "src/commands");
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^cmd_(.+)\.cpp$/) {
+       foreach $name (sort readdir(DIRHANDLE))
+       {
+               if ($name =~ /^cmd_(.+)\.cpp$/)
+               {
                        $cmdlist[$i++] = $1;
+                       $install_list = $install_list . "       -install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n";
                }
        }
        closedir(DIRHANDLE);
 
-       $se = "socketengine_select";
-       if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-               $se = "socketengine_kqueue";
+       if (!$has_epoll)
+       {
+               $config{USE_EPOLL} = 0;
        }
-       elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-               $se = "socketengine_epoll";
+       if (!$has_kqueue)
+       {
+               $config{USE_KQUEUE} = 0;
        }
-       elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
-               $se = "socketengine_ports";
+       if (!$has_ports)
+       {
+               $config{USE_PORTS} = 0;
        }
 
-       $extrasources{"socketengine.cpp"} = $se . ".cpp";
-       $extraobjects{"socketengine.cpp"} = $se . ".o";
+       print "Scanning src folder for core files";
+       opendir(DIRHANDLE, "src");
+       foreach $name (sort readdir(DIRHANDLE))
+       {
+               if ($name =~ /\.cpp$/)
+               {
+                       open (CPP, "<src/$name") or die("Can't open src/$name to scan it! oh bugger");
+                       while (chomp($line = <CPP>))
+                       {
+                               if ($line =~ /\/\* \$Core: (\w+) \*\//i)
+                               {
+                                       $filelist{$name} = $1;
+                                       print ".";
+                               }
+                               elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i)
+                               {
+                                       $specialdeps{$name} = $1;
+                               }
+                               elsif ($line =~ /\/\* \$ExtraObjects: (.*?) \*\//i)
+                               {
+                                       $extraobjects{$name} = $1;
+                               }
+                               elsif ($line =~ /\/\* \$ExtraBuild: (.*?) \*\//i)
+                               {
+                                       $extrabuildlines{$name} = $1;
+                               }
+                               elsif ($line =~ /\/\* \$ExtraSources: (.*?) \*\//i)
+                               {
+                                       $extrasources{$name} = $1;
+                               }
+                               elsif ($line =~ /\/\* \$If: (\w+) \*\//i)
+                               {
+                                       if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
+                                       {
+                                               # Skip to 'endif'
+                                               while (chomp($line = <CPP>))
+                                               {
+                                                       die ("\$If buildsystem instruction within another \$If in file src/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
+                                                       last if ($line =~ /\/\* \$EndIf \*\//i);
+                                               }
+                                       }
+                               }
+                       }
+                       close CPP;
+               }
+       }
+       closedir(DIRHANDLE);
+       print " done!\n";
 
        $freebsd4libs = $config{CRAQ};
 
@@ -1490,6 +1533,7 @@ sub write_dynamic_makefile {
        {
                $all = $all . $filelist{$cpp} . "." . $libraryext . " ";
                $all_libsonly = $all_libsonly . $filelist{$cpp} . "." . $libraryext . " ";
+               $install_list = $install_list . "       -install -m \$(INSTMODE) src/" . $filelist{$cpp} . "." . $libraryext . " \$(LIBPATH)\n";
        }
        $all = $all . "moo inspircd\n";