Check g++ not gcc in configure

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

diff --git a/configure b/configure
index 2585e76124d319d6b774c9d3b7c378506fa73b6d..960d4a1ecfb7631d4f7a56fa8e5f28560ac4a248 100755 (executable)
--- a/configure
+++ b/configure
@@ -39,8 +39,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 +52,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,15 +887,19 @@ sub getmodules {
 }
 
 sub getrevision {
+       if ($no_svn) {
+               return "0";
+       }
        my $data = `svn info`;
        if ($data eq "") {
-               $rev = "r0";
+               $no_svn = 1;
+               $rev = "0";
                return $rev;
        }
        $data =~ /Revision: (\d+)/;
        my $rev = $1;
        if (!defined($rev)) {
-               $rev = "r0";
+               $rev = "0";
        }
        return $rev;
 }