X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=8edcdfe08b0a2179c54c47f88f696d3d809c6530;hb=33b908aedc61d2bce3dcf8f062d6522e3bd14dfa;hp=721505fcc95ec5615b04d99e72c591d281c19d89;hpb=bdf42d61259476c362590b9ccfb2feea33f72329;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 721505fcc..8edcdfe08 100755
--- a/configure
+++ b/configure
@@ -1,16 +1,30 @@
 #!/usr/bin/env perl
-###################################################
-# InspIRCd Configuration Script
+
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+#   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+#   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+#   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+#   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+#   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+#   Copyright (C) 2003-2006 Craig McLure <craig@chatspike.net>
 #
-# Copyright 2002-2010 The InspIRCd Development Team
-#  http://wiki.inspircd.org/Credits
+# This file is part of InspIRCd.  InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
 #
-# Licensed under GPL, please see the COPYING file
-# for more information
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
 #
-# $Id$
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-###################################################
+
 
 BEGIN {
 	require 5.8.0;
@@ -228,8 +242,12 @@ if ($config{OSNAME} =~ /darwin/i)
 {
 	$config{IS_DARWIN} = "YES";
 	$config{STARTSCRIPT}	  = "org.inspircd.plist";		# start script for OSX.
+	$config{CC} 		    = "xcrun clang++";					# C++ compiler for OSX.
+}
+else
+{
+	$config{CC} 		    = "g++";						# C++ compiler
 }
-$config{CC} 		    = "g++";						# C++ compiler
 if (defined $opt_cc)
 {
 	$config{CC} = $opt_cc;
@@ -247,7 +265,11 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) {
 }
 
 if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
-	print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
+	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";		
+	}
 	exit;
 }
 
@@ -603,8 +625,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 	}
 	else
 	{
-		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\n";
-		print "you intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
+		print "is in your path.\n\n";
 	}
 
 	yesno('MODUPDATE',"Would you like to check for updates to third-party modules?");