X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=make%2Futilities.pm;h=ae16ce3dc92836f238ab8f04d54223c58371f567;hb=3fbba606c3fbb76a5bc045d4d7717528366ae84e;hp=8c8ac0d49ca70d32eb33dbcec29401888f112ee7;hpb=1cf1f1fba94c6749f7b4d02c8138349ba75c9c1a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index 8c8ac0d49..ae16ce3dc 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -95,6 +95,7 @@ sub make_rpath($;$)
 
 sub extend_pkg_path()
 {
+	return if defined $ENV{DISABLE_EXTEND_PKG_PATH};
 	if (!exists $ENV{PKG_CONFIG_PATH})
 	{
 		$ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";
@@ -318,6 +319,15 @@ 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 =~ /if(gt|lt)\("(.+?)","(.+?)"\)/) {
+			chomp(my $result = `$2 2>/dev/null`);
+			if (($1 eq 'gt' && $result le $3) || ($1 eq 'lt' && $result ge $3)) {
+				$line = substr $line, 0, $-[0];
+			} else {
+				$line =~ s/if$1\("$2","$3"\)//;
+			}
+		}
+
 		if ($line =~ /ifuname\(\!"(\w+)"\)/)
 		{
 			my $uname = $1;