Send SVSNICKs during nick collision to prevent servers that do not fully implement...

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

diff --git a/make/configure.pm b/make/configure.pm
index 68e4240f9ac1b241da10eb335f424104c20f0332..b7f621a37f86927be777025c116f1f0c1b568649 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -2,7 +2,7 @@
 #       | Inspire Internet Relay Chat Daemon |
 #       +------------------------------------+
 #
-#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
 # See: http://www.inspircd.org/wiki/index.php/Credits
 #
 # This program is free but copyrighted software; see
@@ -56,16 +56,17 @@ sub getrevision {
        {
                return "0";
        }
-       my $data = `svn info`;
+       my $data = `svn info 2>/dev/null`;
        if ($data eq "")
        {
-               $data = `git-svn info`;
+               $data = `git describe --tags 2>/dev/null`;
                if ($data eq "")
                {
                        $no_svn = 1;
-                       my $rev = "0";
-                       return $rev;
+                       return '0';
                }
+               chomp $data; # remove \n
+               return $data;
        }
        $data =~ /Revision: (\d+)/;
        my $rev = $1;
@@ -153,8 +154,15 @@ sub nopedantic {
 
 sub getmodules
 {
+       my ($silent) = @_;
+
        my $i = 0;
-       print "Detecting modules ";
+
+       if (!$silent)
+       {
+               print "Detecting modules ";
+       }
+
        opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!");
        foreach my $name (sort readdir(DIRHANDLE))
        {
@@ -162,11 +170,18 @@ sub getmodules
                {
                        my $mod = $1;
                        $main::modlist[$i++] = $mod;
-                       print ".";
+                       if (!$silent)
+                       {
+                               print ".";
+                       }
                }
        }
        closedir(DIRHANDLE);
-       print "\nOk, $i modules.\n";
+
+       if (!$silent)
+       {
+               print "\nOk, $i modules.\n";
+       }
 }
 
 sub promptnumeric($$)