X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=9281246fbbc1d320ff8df941b9c2387911d92646;hb=2fb2f639ad8b584a6e778569bc871f50d2de2d7e;hp=cb61755fed1481114080f2014fbcf849969cdef2;hpb=ca571fc1bfa87da2d6b4b8b2d01c90991e14e106;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index cb61755fe..9281246fb 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,14 +1,24 @@
-#       +------------------------------------+
-#       | Inspire Internet Relay Chat Daemon |
-#       +------------------------------------+
 #
-#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
-# See: http://www.inspircd.org/wiki/index.php/Credits
+# InspIRCd -- Internet Relay Chat Daemon
 #
-# This program is free but copyrighted software; see
-#      the file COPYING for details.
+#   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+#   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+#   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+#
+# 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.
+#
+# 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 <http://www.gnu.org/licenses/>.
 #
-# ---------------------------------------------------
+
 
 package make::utilities;
 
@@ -21,7 +31,7 @@ use Exporter 'import';
 use POSIX;
 use Getopt::Long;
 use Fcntl;
-our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck);
+our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
 
 # Parse the output of a *_config program,
 # such as pcre_config, take out the -L
@@ -116,9 +126,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 +159,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;
@@ -169,29 +186,6 @@ sub pkgconfig_get_include_dirs($$$;$)
 	return $ret;
 }
 
-sub vcheck($$)
-{
-	my ($version1, $version2) = @_;
-	$version1 =~ s/\-r(\d+)/\.$1/g; # minor revs/patchlevels
-	$version2 =~ s/\-r(\d+)/\.$1/g;
-	$version1 =~ s/p(\d+)/\.$1/g;
-	$version2 =~ s/p(\d+)/\.$1/g;
-	$version1 =~ s/\-//g;
-	$version2 =~ s/\-//g;
-	$version1 =~ s/[a-z]//g;
-	$version2 =~ s/[a-z]//g;
-	my @v1 = split('\.', $version1);
-	my @v2 = split('\.', $version2);
-	for (my $curr = 0; $curr < scalar(@v2); $curr++)
-	{
-		if ($v1[$curr] < $v2[$curr])
-		{
-			return 0;
-		}
-	}
-	return 1;
-}
-
 sub pkgconfig_check_version($$;$)
 {
 	my ($packagename, $version, $module) = @_;
@@ -207,7 +201,7 @@ sub pkgconfig_check_version($$;$)
 	}
 	if ((defined $v) && ($v ne ""))
 	{
-		if (vcheck($v,$version) == 1)
+		if (!system "pkg-config --atleast-version $version $packagename")
 		{
 			print "\e[1;32mYes (version $v)\e[0m\n";
 			return 1;
@@ -447,6 +441,7 @@ 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";