Convert a number of modules to using privs.

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

diff --git a/make/configure.pm b/make/configure.pm
index ba586e3e6c55b9cce90c779c08085efd012a40a1..5444ca40cd86ca9fd4a6993e625ec01b911eae27 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -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;
@@ -149,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))
        {
@@ -158,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($$)