X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=b467ce6265ecde0307b96f56032f776cc67a34e5;hb=ec48546cd05136c61f85d669a3dc49a874935a89;hp=df7cbd5f392de881122c317333071ec2a47564aa;hpb=3d023700b1e697055e6a6688d419644395c218cb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index df7cbd5f3..b467ce626 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 # InspIRCd Configuration Script
 #
 # Copyright 2003 The ChatSpike Development Team
@@ -39,8 +40,8 @@ $config{THREADED_DNS}       = "n";						# threaded dns (experimental)
 $config{STATIC_LINK}	    = "no";						# are doing static modules?
 chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);           		# FD Limit
 chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);			# Hard FD Limit
-chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);   		# Major GCC Version
-chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);   		# Minor GCC Version
+chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   		# Major GCC Version
+chomp($config{GCC34}        = `g++ -dumpversion | cut -c 3`);   		# Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
 $config{MAKEORDER}	    = "ircd mods";					# build order
@@ -52,6 +53,8 @@ $config{MAX_KICK}           = "255";						# max kick message size
 $config{MAX_GECOS}          = "128";						# max GECOS size
 $config{MAX_AWAY}           = "200";						# max AWAY size
 
+$no_svn = 0;
+
 $config{HAS_OPENSSL} =~ /OpenSSL (\S+) \d+ \S+ \d{4}/;
 $config{HAS_OPENSSL} = $1;
 
@@ -885,11 +888,19 @@ sub getmodules {
 }
 
 sub getrevision {
+	if ($no_svn) {
+		return "0";
+	}
 	my $data = `svn info`;
+	if ($data eq "") {
+		$no_svn = 1;
+		$rev = "0";
+		return $rev;
+	}
 	$data =~ /Revision: (\d+)/;
 	my $rev = $1;
 	if (!defined($rev)) {
-		$rev = "r0";
+		$rev = "0";
 	}
 	return $rev;
 }
@@ -1254,7 +1265,7 @@ 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)\n";
+	$crud = $crud . "	\@install -v -m 0700 m_$i.so \$(MODPATH)\n";
 	###
 	# End Write Entry to the MakeFile
 	###