X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=fae17dfeab52af236155c55c8782066f85be7aae;hb=09d94db2f06ce1521f19566b3d988cff4b02af6b;hp=33e9b4c505061cebe29e8d946210ecccc5d2902e;hpb=bc7a3fba087ef8646e93ebda40f344d67f613db5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 33e9b4c50..fae17dfea 100755
--- 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;
@@ -260,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
@@ -281,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;
 }
 
@@ -664,12 +660,12 @@ dumphash();
 
 if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
 {
-	print "Sorry, but I couldn't detect GnuTLS. Make sure gnutls-config is in your path.\n";
+	print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n";
 	exit(0);
 }
 if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
 {
-	print "Sorry, but I couldn't detect OpenSSL. Make sure openssl is in your path.\n";
+	print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config and openssl are in your path.\n";
 	exit(0);
 }
 our $failed = 0;