Convert more by-values to const references, optimise ConfigReader a bit

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

diff --git a/configure b/configure
index 872b151f57469b8807ac50c88d75c31f2716ace3..ef17e9bb350024db87fde6295a916e427c671daf 100755 (executable)
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);                 # Major GCC Ve
 chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);                  # Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                                   # Operating System Name
 $config{CC}                = "g++";                                            # C++ compiler
-$config{MAKEORDER}         = "ircd mods config bininst";                       # build order
+$config{MAKEORDER}         = "ircd mods";                                      # build order
 $config{STATICLIBS}         = "";                                              # library archive path
 $config{MAX_IDENT}          = "12";                                            # max ident size
 $config{MAX_QUIT}           = "255";                                           # max quit message size
@@ -816,12 +816,12 @@ sub getosflags {
                        $config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
                        $config{LDLIBS} = "";
                        $config{MAKEPROG} = "/usr/bin/make";
-                       $config{MAKEORDER} = "ircd mods config bininst";
+                       $config{MAKEORDER} = "ircd mods";
                } elsif ($config{OSNAME} eq "CYG-STATIC") {
                        $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
                        $config{LDLIBS} = "";
                        $config{MAKEPROG} = "/usr/bin/make";
-                       $config{MAKEORDER} = "mods ircd config bininst";
+                       $config{MAKEORDER} = "mods ircd";
                        $config{STATICLIBS} = "modules/mods.a";
                        $config{STATIC_LINK} = "yes";
                }
@@ -869,7 +869,7 @@ sub writefiles {
        chomp(my $incos = `uname -n -s -r`);
        chomp(my $version = `sh ./src/version.sh`);
         chomp(my $revision = `./src/svn-rev.sh`);
-       $version = "$version (r$revision)";
+       $version = "$version(r$revision)";
        chomp(my $revision2 = `./src/svn-rev.sh`);
        open(FILEHANDLE, ">include/inspircd_config.h");
        my $NL = $config{NICK_LENGT}+1;
@@ -1223,19 +1223,12 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
        \$(CC) \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
 
 EOCHEESE
-       $crud = $crud . "
-       install -v -m 0700 m_$i.so \$(MODPATH)
-";
-
-EOCHEESE
+       $crud = $crud . "       install -v -m 0700 m_$i.so \$(MODPATH)\n";
        ###
        # End Write Entry to the MakeFile
        ###
        }
-       print FILEHANDLE "modinst:
-" . $crud;
-
-EOPIE
+       print FILEHANDLE "modinst:\n    \@echo \"Installing modules...\"\n" . $crud;
 }