Don't bind ports after an unsuccessful rehash

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

diff --git a/configure b/configure
index 27f7e6f1ec4290a7d310f491040243f8ff5dd90e..425bb21af75e4ba360860f3ed1da484d78cfcec0 100755 (executable)
--- a/configure
+++ b/configure
@@ -33,12 +33,6 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);
 
-use Data::Dumper;
-BEGIN {
-       $Data::Dumper::Sortkeys = 1;
-       $Data::Dumper::Useqq = 1;
-};
-
 use File::Copy ();
 use Socket;
 use Cwd;
@@ -209,6 +203,7 @@ else
        {
                chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);           # Openssl version, others
                $config{HAS_OPENSSL_PORT} = "";
+               $config{USE_FREEBSD_BASE_SSL} = "n";
        }
 }
 
@@ -259,6 +254,11 @@ if ($config{OSNAME} =~ /darwin/i)
        $config{STARTSCRIPT}      = "org.inspircd.plist";               # start script for OSX.
        $config{CC}                 = "xcrun clang++";                                  # C++ compiler for OSX.
 }
+elsif ($config{OSNAME} =~ /freebsd/i)
+{
+       chomp(my $fbsd_version = `uname -r`);
+       $config{CC} = $fbsd_version ge '10.0' ? 'clang++' : 'g++';
+}
 else
 {
        $config{CC}                 = "g++";                                            # C++ compiler
@@ -280,11 +280,8 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
 }
 
 if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
-       if ($config{IS_DARWIN} eq "YES") {
-               print $config{CC} . " was not found! You require clang++ (the LLVM C++ compiler, part of the OSX developer tools) to build InspIRCd!\n";
-       } else {
-               print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";         
-       }
+       print "`$config{CC}` was not found! A C++ compiler is required to build InspIRCd!\n";
+       print "You can pass a custom compiler to $0 using --with-cc=[name].\n";
        exit;
 }