X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=5444ca40cd86ca9fd4a6993e625ec01b911eae27;hb=fee65af28e1db5cc431bda2dc643952b88461a74;hp=ba586e3e6c55b9cce90c779c08085efd012a40a1;hpb=8424e1367b33e8605361cd8aa4584405e4a74fd7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index ba586e3e6..5444ca40c 100644
--- 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($$)