X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=ad7a32f8fbeaec29dcc0b1028a267f587e60896b;hb=0d9a2dc982d379b5b16382b9e44329414521aeba;hp=f280a27980d0161a9d3cad1fac5a97d2a9bdbefb;hpb=39e6732f2396be04b6fbc7ce30c7ab1f3c98a78c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index f280a2798..ad7a32f8f 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.
@@ -30,6 +30,7 @@ our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pk
 # \e[1;32msrc/Makefile\e[0m
 
 my %already_added = ();
+my $if_skip_lines = 0;
 
 sub promptstring($$$$$)
 {
@@ -113,12 +114,11 @@ sub pkgconfig_get_include_dirs($$$;$)
 	my $v = `pkg-config --modversion $packagename 2>/dev/null`;
 	my $ret = `pkg-config --cflags $packagename 2>/dev/null`;
 	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;
@@ -182,7 +189,7 @@ sub vcheck($$)
 	$version2 =~ s/[a-z]//g;
 	my @v1 = split('\.', $version1);
 	my @v2 = split('\.', $version2);
-	for (my $curr = 0; $curr < scalar(@v1); $curr++)
+	for (my $curr = 0; $curr < scalar(@v2); $curr++)
 	{
 		if ($v1[$curr] < $v2[$curr])
 		{
@@ -320,6 +327,65 @@ sub translate_functions($$)
 		{
 			die "Developers should no longer use backticks in configuration macros. Please use exec() and eval() macros instead. Offending line: $line (In module: $module)";
 		}
+
+		if ($line =~ /ifuname\(\!"(\w+)"\)/)
+		{
+			my $uname = $1;
+			if ($uname eq $^O)
+			{
+				$line = "";
+				return "";
+			}
+
+			$line =~ s/ifuname\(\!"(.+?)"\)//;
+		}
+
+		if ($line =~ /ifuname\("(\w+)"\)/)
+		{
+			my $uname = $1;
+			if ($uname ne $^O)
+			{
+				$line = "";
+				return "";
+			}
+
+			$line =~ s/ifuname\("(.+?)"\)//;
+		}
+
+		if ($line =~ /if\("(\w+)"\)/)
+		{
+			if (defined $main::config{$1})
+			{
+				if (($main::config{$1} !~ /y/i) and ($main::config{$1} ne "1"))
+				{
+					$line = "";
+					return "";
+				}
+			}
+
+			$line =~ s/if\("(.+?)"\)//;
+		}
+		if ($line =~ /if\(\!"(\w+)"\)/)
+		{
+			if (!exists $main::config{$1})
+			{
+				$line = "";
+				return "";
+			}
+			else
+			{
+				if (defined $1)
+				{
+					if (exists ($main::config{$1}) and (($main::config{$1} =~ /y/i) or ($main::config{$1} eq "1")))
+					{
+						$line = "";
+						return "";
+					}
+				}
+			}
+
+			$line =~ s/if\(\!"(.+?)"\)//;
+		}
 		while ($line =~ /exec\("(.+?)"\)/)
 		{
 			print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n";
@@ -345,7 +411,6 @@ sub translate_functions($$)
 			close TF;
 			my $replace = `perl $tmpfile`;
 			chomp($replace);
-			unlink($tmpfile);
 			$line =~ s/eval\("(.+?)"\)/$replace/;
 		}
 		while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
@@ -387,8 +452,12 @@ sub translate_functions($$)
 	if ($@)
 	{
 		my $err = $@;
-		$err =~ s/at .+? line \d+.*//g;
+		#$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