Fix copyright headers.

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

diff --git a/configure b/configure
index fca38ccb9d65e2f6cd7fd9eb20eb904df3c101bd..1104d4209347ca34ea2d313c782050d129901255 100755 (executable)
--- a/configure
+++ b/configure
@@ -713,13 +713,18 @@ if ($config{USE_GNUTLS} eq "y") {
 * few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-                       make_gnutls_cert();
-                       print "\nCertificate generation complete, copying to config directory... ";
-                       system("mv key.pem $config{CONFIG_DIR}/key.pem");
-                       system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
-                       print "Done.\n\n";
-               } else {
-                       print "SSL Certificates found, skipping.\n\n"
+                       make_gnutls_cert() or $failed = 1;
+                       if (!$failed) {
+                               print "\nCertificate generation complete, copying to config directory... ";
+                               system("mv key.pem $config{CONFIG_DIR}/key.pem");
+                               system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
+                               print "Done.\n\n";
+                       } else {
+                               print "\n\033[1;32mCertificate generation failed!\033[0m\n\n";
+                       }
+               }
+               else {
+                       print "SSL Certificates found, skipping.\n\n";
                }
        }
        else
@@ -1191,13 +1196,16 @@ sub write_static_modules_makefile {
        # Module Makefile Header
        ###
        print FILEHANDLE <<EOF;
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Many Thanks to Andrew Church <achurch\@achurch.org>
-#    for assisting with making this work right.
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
+#
+# Thanks to Andrew Church <achurch\@achurch.org>
+#  for assisting with making this work right.
 #
-# Automatically Generated by ./configure to add a modules
-# please run ./configure --update
+# Automatically Generated by ./configure to add a
+#  modules please run ./configure --modupdate
+###################################################
 
 all: \$(MODULES)
 
@@ -1293,13 +1301,16 @@ sub write_dynamic_modules_makefile {
 # Module Makefile Header
 ###
        print FILEHANDLE <<EOF;
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Many Thanks to Andrew Church <achurch\@achurch.org>
-#    for assisting with making this work right.
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
 #
-# Automatically Generated by ./configure to add a modules
-# please run ./configure -update or ./configure -modupdate
+# Thanks to Andrew Church <achurch\@achurch.org>
+#   for assisting with making this work right.
+#
+# Automatically Generated by ./configure to add a
+#  modules please run ./configure -modupdate
+###################################################
 
 all: \$(MODULES)
 
@@ -1351,15 +1362,15 @@ EOCHEESE
                if ($name =~ /^m_(.+?)$/) {
                        $crapola = "";
                        $crap3 = "";
+                       $mliflags = "";
                        # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
                        if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
-                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... ";
                                my $i = 0;
                                print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h"; 
                                foreach $fname (sort readdir(MDIRHANDLE)) {
                                        if ($fname =~ /\.cpp$/) {
                                                $cmflags = getcompilerflags("src/modules/$name/$fname");
-                                               $liflags = getlinkerflags("src/modules/$name/$fname");
+                                               $mliflags = $mliflags . " " . getlinkerflags("src/modules/$name/$fname");
                                                $deps = getdependencies("src/modules/$name/$fname");
                                                $oname = $fname;
                                                $oname =~ s/\.cpp$/.o/g;
@@ -1370,11 +1381,11 @@ EOCHEESE
                                                $i++;
                                        }
                                }
-                               print "(\033[1;32m$i files found\033[0m)\n";
+                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... (\033[1;32m$i files found\033[0m)\n";
                                if ($config{IS_DARWIN} eq "YES") {
                                        print FILEHANDLE "\n    \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle -o $name.so $crap3\n"; 
                                } else {
-                                       print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
+                                       print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $crap3\n";
                                }
                                print FILEHANDLE "\n$crapola\n";
                                closedir(MDIRHANDLE);
@@ -1406,12 +1417,16 @@ sub write_static_makefile {
                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
        }
        print FH <<EOM;
-# Insp Makefile :p
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
 #
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Makefile version 2 (statically linked core) by <brain\@inspircd.org>
+# Thanks to Andrew Church <achurch\@achurch.org>
+#  for assisting with making this work right.
 #
+# This file is automagically generated by configure
+# Any changes made will be lost on ./configure
+###################################################
 
 CC = im a cheezeball
 
@@ -1571,12 +1586,16 @@ sub write_dynamic_makefile {
 
        open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;
-# Insp Makefile :p
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
 #
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Makefile version 2 (dynamically linked core) by <brain\@inspircd.org>
+# Thanks to Andrew Church <achurch\@achurch.org>
+#  for assisting with making this work right.
 #
+# This file is automagically generated by configure 
+# Any changes made will be lost on ./configure         
+###################################################
 
 CC = im a cheezeball