X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=9776ae7f4900fd80de591eb636ab67639ad35655;hb=fc98fbf44d18ba866102544ca09f1b1c551fdb49;hp=fdc4c4c7bdc1932e2bfc2452ab4854fb5e092be2;hpb=4564ed215cfde77e648a1aa8110ebe5de1252764;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/utilities.pm b/make/utilities.pm index fdc4c4c7b..9776ae7f4 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -2,8 +2,8 @@ # | Inspire Internet Relay Chat Daemon | # +------------------------------------+ # -# InspIRCd: (C) 2002-2007 InspIRCd Development Team -# See: http://www.inspircd.org/wiki/index.php/Credits +# InspIRCd: (C) 2002-2009 InspIRCd Development Team +# See: http://wiki.inspircd.org/Credits # # This program is free but copyrighted software; see # the file COPYING for details. @@ -149,7 +149,14 @@ sub pkgconfig_get_include_dirs($$$;$) $headername =~ s/^\///; promptstring("path to the directory containing $headername", $key, "/usr/include",$packagename,"$packagename-includes"); $packagename =~ tr/a-z/A-Z/; - $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\""; + if (defined $v) + { + $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\""; + } + else + { + $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"0.0\""; + } $main::config{$key} =~ s/^\s+//g; $ret = $main::config{$key}; return $ret; @@ -447,6 +454,9 @@ sub translate_functions($$) my $err = $@; #$err =~ s/at .+? line \d+.*//g; print "\n\nConfiguration failed. The following error occured:\n\n$err\n"; + print "\nIn the case of gnutls configuration errors on debian,\n"; + print "Ubuntu, etc, you should ensure that you have installed\n"; + print "gnutls-bin as well as gnutls-dev and gnutls.\n"; exit; } else