Changed a CXX to a CC

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

diff --git a/configure b/configure
index 7b51640f78048acab860cbee3e9cca798b1de6fb..0f95476b5f4b407ec48379cfa01b6f8716d0a195 100755 (executable)
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@ chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                         # 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{OSNAME}       = `/bin/uname`);                                   # Operating System Name
-$config{CC}                = `g++`;                                            # C++ compiler
+$config{CC}                = "g++";                                            # C++ compiler
 
 if ((!$config{OSNAME}) || ($config{OSNAME} eq "")) {
   chomp($config{OSNAME} = `/usr/bin/uname`);
@@ -287,7 +287,7 @@ print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\n";
 print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\n";
 print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\n";
 print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.$config{GCC34}\n";
-print "\033[0mOptimatizaton Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n\n";
+print "\033[0mOptimatizaton Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
 print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n\n";
 
 makecache();
@@ -385,6 +385,8 @@ sub getosflags {
     $config{MAKEPROG} = "gmake";
     if ($config{OSNAME} eq "OpenBSD") {
        $config{CC} = "eg++";
+       chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change
+       chomp($config{GCC34}        = `eg++ -dumpversion | cut -c 3`); # the compiler path
     }
   } else {
     $config{LDLIBS} = "-ldl";
@@ -509,6 +511,7 @@ EOF
       }
       close(FILEHANDLE);
 
+      $tmp =~ s/\@CC\@/$config{CC}/;
       $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
       $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;