X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=ca769465feee40a13556a9f2c67bfb8e624682ba;hb=b4b66ad9600ff64b62bbfeabc8dc2579918b77b3;hp=fdc4c4c7bdc1932e2bfc2452ab4854fb5e092be2;hpb=4564ed215cfde77e648a1aa8110ebe5de1252764;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index fdc4c4c7b..ca769465f 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-2010 InspIRCd Development Team
+# See: http://wiki.inspircd.org/Credits
 #
 # This program is free but copyrighted software; see
 #      the file COPYING for details.
@@ -116,9 +116,9 @@ sub pkgconfig_get_include_dirs($$$;$)
 	my $foo = "";
 	if ((!defined $v) || ($v eq ""))
 	{
-		$foo = `locate "$headername" | head -n 1`;
-		$foo =~ /(.+)\Q$headername\E/;
-		my $find = $1;
+		print "\e[31mCould not find $packagename via pkg-config\e[m (\e[1;32mplease install pkg-config\e[m)\n";
+		$foo = `locate "$headername" 2>/dev/null | head -n 1`;
+		my $find = $foo =~ /(.+)\Q$headername\E/ ? $1 : '';
 		chomp($find);
 		if ((defined $find) && ($find ne "") && ($find ne $packagename))
 		{
@@ -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,10 @@ sub translate_functions($$)
 		my $err = $@;
 		#$err =~ s/at .+? line \d+.*//g;
 		print "\n\nConfiguration failed. The following error occured:\n\n$err\n";
+		print "\nMake sure you have pkg-config installed\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