diff options
| author | Sir Pogsalot <sir.pogsalot@gmail.com> | 2012-03-21 13:24:48 -0700 |
|---|---|---|
| committer | Sir Pogsalot <sir.pogsalot@gmail.com> | 2012-03-21 13:24:48 -0700 |
| commit | d62e3215202ebb9ac0707b08e233acc130888fe8 (patch) | |
| tree | bc63972bf448dca76927eff3a61b71c3df8e0755 | |
| parent | fe7dbd2c104c37f6f3af7d9f1646a3c332aea4a4 (diff) | |
| parent | 2e266c880c92b995701b5c09b01ad66541d524c3 (diff) | |
Merge pull request #2 from SaberUK/insp20
Fixes for OS X, the ModuleManager sources and some typos.
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | sources.list | 2 | ||||
| -rw-r--r-- | src/commands/cmd_clearcache.cpp | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -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; } diff --git a/sources.list b/sources.list index 16bdeec15..22610ca76 100644 --- a/sources.list +++ b/sources.list @@ -6,4 +6,4 @@ # # Feel free to add additional sources! :) # official repository -http://gitorious.org/inspircd/inspircd-extras/blobs/raw/master/modules.lst +https://raw.github.com/inspircd/inspircd-extras/master/modules.lst diff --git a/src/commands/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp index ecf2c07fc..c5492a8b6 100644 --- a/src/commands/cmd_clearcache.cpp +++ b/src/commands/cmd_clearcache.cpp @@ -17,7 +17,7 @@ #include "channels.h" #include "ctables.h" -/** Handle /ADMIN. These command handlers can be reloaded by the core, +/** Handle /CLEARCACHE. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these * may not. |