X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure;h=8edcdfe08b0a2179c54c47f88f696d3d809c6530;hb=33b908aedc61d2bce3dcf8f062d6522e3bd14dfa;hp=0b7700b2ae2b6ff4736f7dc87b757695a3618237;hpb=b0ca1c921f606671a13451c86e1faf0add848b4c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index 0b7700b2a..8edcdfe08 100755 --- a/configure +++ b/configure @@ -1,16 +1,30 @@ #!/usr/bin/env perl -################################################### -# InspIRCd Configuration Script + +# +# InspIRCd -- Internet Relay Chat Daemon # -# Copyright 2002-2010 The InspIRCd Development Team -# http://wiki.inspircd.org/Credits +# Copyright (C) 2009-2010 Daniel De Graaf +# Copyright (C) 2007, 2009 Dennis Friis +# Copyright (C) 2003, 2006-2008 Craig Edwards +# Copyright (C) 2006-2008 Robin Burchell +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2007 John Brooks +# Copyright (C) 2006 Oliver Lupton +# Copyright (C) 2003-2006 Craig McLure # -# Licensed under GPL, please see the COPYING file -# for more information +# 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. # -# $Id$ +# 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. # -################################################### +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + BEGIN { require 5.8.0; @@ -228,7 +242,7 @@ 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. + $config{CC} = "xcrun clang++"; # C++ compiler for OSX. } else { @@ -252,7 +266,7 @@ 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 LLVN C++ compiler, part of the OSX developer tools) to build InspIRCd!\n"; + 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"; } @@ -611,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?");