Replace the IP (in addition to hostname) for CGIIRC clients; fixes glines and zlines...

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

diff --git a/make/configure.pm b/make/configure.pm
index ab440f07fc85a7d78582b324fd0af48eff0cdd19..5444ca40cd86ca9fd4a6993e625ec01b911eae27 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -20,7 +20,7 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s);
+our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies getmodversion nopedantic resolve_directory yesno showhelp promptstring_s);
 
 my $no_svn = 0;
 
@@ -56,12 +56,17 @@ sub getrevision {
        {
                return "0";
        }
-       my $data = `svn info`;
+       my $data = `svn info 2>/dev/null`;
        if ($data eq "")
        {
-               $no_svn = 1;
-               my $rev = "0";
-               return $rev;
+               $data = `git describe --tags 2>/dev/null`;
+               if ($data eq "")
+               {
+                       $no_svn = 1;
+                       return '0';
+               }
+               chomp $data; # remove \n
+               return $data;
        }
        $data =~ /Revision: (\d+)/;
        my $rev = $1;
@@ -117,6 +122,21 @@ sub getdependencies {
        return "";
 }
 
+sub getmodversion {
+       my ($file) = @_;
+       open(FLAGS, $file) or return "";
+       while (<FLAGS>) {
+               if ($_ =~ /^\/\* \$ModVersion: (.+) \*\/$/) {
+                       my $x = translate_functions($1, $file);
+                       next if ($x eq "");
+                       close(FLAGS);
+                       return $x;
+               }
+       }
+       close(FLAGS);
+       return "";
+}
+
 sub nopedantic {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
@@ -134,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))
        {
@@ -143,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($$)
@@ -193,7 +227,7 @@ sub dumphash()
        print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
        print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
        print "\e[0mLibrary path:\e[1;32m\t\t\t$main::config{LIBRARY_DIR}\e[0m\n";
-       print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.x\e[0m\n";
+       print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.$main::config{GCCMINOR}\e[0m\n";
        print "\e[0mCompiler program:\e[1;32m\t\t$main::config{CC}\e[0m\n";
        print "\e[0mIPv6 Support:\e[1;32m\t\t\t$main::config{IPV6}\e[0m\n";
        print "\e[0mIPv6 to IPv4 Links:\e[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\e[0m\n";