Merge pull request #2 from SaberUK/insp20

Fixes for OS X, the ModuleManager sources and some typos.

1 files changed, 10 insertions, 2 deletions

diff --git a/configure b/configure
index 721505fcc..f354b62e1 100755
--- a/configure
+++ b/configure
@@ -228,8 +228,12 @@ if ($config{OSNAME} =~ /darwin/i)
 {
 	$config{IS_DARWIN} = "YES";
 	$config{STARTSCRIPT}	  = "org.inspircd.plist";		# start script for OSX.
+	$config{CC} 		    = "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 +251,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;
 }