X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=fdc4c4c7bdc1932e2bfc2452ab4854fb5e092be2;hb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;hp=06105e215a4471e00304efa9b6703597a4d712b9;hpb=c33249de90907d653f127f7970f366c40f3ca3cf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index 06105e215..fdc4c4c7b 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -27,9 +27,10 @@ our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pk
 # such as pcre_config, take out the -L
 # directive and return an rpath for it.
 
-# \033[1;32msrc/Makefile\033[0m
+# \e[1;32msrc/Makefile\e[0m
 
 my %already_added = ();
+my $if_skip_lines = 0;
 
 sub promptstring($$$$$)
 {
@@ -41,18 +42,18 @@ sub promptstring($$$$$)
 		GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch);
 		if (defined $opt_commandlineswitch)
 		{
-			print "\033[1;32m$opt_commandlineswitch\033[0m\n";
+			print "\e[1;32m$opt_commandlineswitch\e[0m\n";
 			$var = $opt_commandlineswitch;
 		}
 		else
 		{
-			die "Could not detect $package! Please specify the $prompt via the command line option \033[1;32m--$commandlineswitch=\"/path/to/file\"\033[0m";
+			die "Could not detect $package! Please specify the $prompt via the command line option \e[1;32m--$commandlineswitch=\"/path/to/file\"\e[0m";
 		}
 	}
 	else
 	{
 		print "\nPlease enter the $prompt?\n";
-		print "[\033[1;32m$default\033[0m] -> ";
+		print "[\e[1;32m$default\e[0m] -> ";
 		chomp($var = <STDIN>);
 	}
 	if ($var eq "")
@@ -72,7 +73,7 @@ sub make_rpath($;$)
 		my $libpath = $1;
 		if (!exists $already_added{$libpath})
 		{
-			print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n";
+			print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n";
 			$already_added{$libpath} = 1;
 		}
 		$output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath;
@@ -100,20 +101,19 @@ sub pkgconfig_get_include_dirs($$$;$)
 	my $key = "default_includedir_$packagename";
 	if (exists $main::config{$key})
 	{
-		print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+		print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 		my $ret = $main::config{$key};
-		print "\033[1;32m$ret\033[0m (cached)\n";
+		print "\e[1;32m$ret\e[0m (cached)\n";
 		return $ret;
 	}
 
 	extend_pkg_path();
 
-	print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+	print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 
 	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`;
@@ -122,7 +122,7 @@ sub pkgconfig_get_include_dirs($$$;$)
 		chomp($find);
 		if ((defined $find) && ($find ne "") && ($find ne $packagename))
 		{
-			print "(\033[1;32mFound via search\033[0m) ";
+			print "(\e[1;32mFound via search\e[0m) ";
 			$foo = "-I$1";
 		}
 		else
@@ -163,7 +163,7 @@ sub pkgconfig_get_include_dirs($$$;$)
 		$main::config{$key} = "$ret -DVERSION_$packagename=\"$v\"";
 		$main::config{$key} =~ s/^\s+//g;
 		$ret = $main::config{$key};
-		print "\033[1;32m$ret\033[0m (version $v)\n";
+		print "\e[1;32m$ret\e[0m (version $v)\n";
 	}
 	$ret =~ s/^\s+//g;
 	return $ret;
@@ -182,7 +182,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])
 		{
@@ -198,7 +198,7 @@ sub pkgconfig_check_version($$;$)
 
 	extend_pkg_path();
 
-	print "Checking version of package \033[1;32m$packagename\033[0m is >= \033[1;32m$version\033[0m... ";
+	print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... ";
 
 	my $v = `pkg-config --modversion $packagename 2>/dev/null`;
 	if (defined $v)
@@ -209,19 +209,19 @@ sub pkgconfig_check_version($$;$)
 	{
 		if (vcheck($v,$version) == 1)
 		{
-			print "\033[1;32mYes (version $v)\033[0m\n";
+			print "\e[1;32mYes (version $v)\e[0m\n";
 			return 1;
 		}
 		else
 		{
-			print "\033[1;32mNo (version $v)\033[0m\n";
+			print "\e[1;32mNo (version $v)\e[0m\n";
 			return 0;
 		}
 	}
 	# If we didnt find it, we  cant definitively say its too old.
 	# Return ok, and let pkgconflibs() or pkgconfincludes() pick up
 	# the missing library later on.
-	print "\033[1;32mNo (not found)\033[0m\n";
+	print "\e[1;32mNo (not found)\e[0m\n";
 	return 1;
 }
 
@@ -232,15 +232,15 @@ sub pkgconfig_get_lib_dirs($$$;$)
 	my $key = "default_libdir_$packagename";
 	if (exists $main::config{$key})
 	{
-		print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+		print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 		my $ret = $main::config{$key};
-		print "\033[1;32m$ret\033[0m (cached)\n";
+		print "\e[1;32m$ret\e[0m (cached)\n";
 		return $ret;
 	}
 
 	extend_pkg_path();
 
-	print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+	print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 
 	my $v = `pkg-config --modversion $packagename 2>/dev/null`;
 	my $ret = `pkg-config --libs $packagename 2>/dev/null`;
@@ -254,7 +254,7 @@ sub pkgconfig_get_lib_dirs($$$;$)
 		chomp($find);
 		if ((defined $find) && ($find ne "") && ($find ne $packagename))
 		{
-			print "(\033[1;32mFound via search\033[0m) ";
+			print "(\e[1;32mFound via search\e[0m) ";
 			$foo = "-L$1";
 		}
 		else
@@ -290,7 +290,7 @@ sub pkgconfig_get_lib_dirs($$$;$)
 	else
 	{
 		chomp($v);
-		print "\033[1;32m$ret\033[0m (version $v)\n";
+		print "\e[1;32m$ret\e[0m (version $v)\n";
 		my $key = "default_libdir_$packagename";
 		$main::config{$key} = $ret;
 		$main::config{$key} =~ s/^\s+//g;
@@ -320,9 +320,68 @@ 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 \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n";
+			print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n";
 			my $replace = `$1`;
 			die $replace if ($replace =~ /Configuration failed/);
 			chomp($replace);
@@ -334,13 +393,13 @@ sub translate_functions($$)
 		}
 		while ($line =~ /eval\("(.+?)"\)/)
 		{
-			print "Evaluating perl code for module \033[1;32m$module\033[0m ... ";
+			print "Evaluating perl code for module \e[1;32m$module\e[0m ... ";
 			my $tmpfile;
 			do
 			{
 				$tmpfile = tmpnam();
 			} until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
-			print "(Created and executed \033[1;32m$tmpfile\033[0m)\n";
+			print "(Created and executed \e[1;32m$tmpfile\e[0m)\n";
 			print TF $1;
 			close TF;
 			my $replace = `perl $tmpfile`;
@@ -356,7 +415,7 @@ sub translate_functions($$)
 		{
 			if (pkgconfig_check_version($1, $2, $module) != 1)
 			{
-				die "Version of package $1 is too old. Please upgrade it to version \033[1;32m$2\033[0m or greater and try again.";
+				die "Version of package $1 is too old. Please upgrade it to version \e[1;32m$2\e[0m or greater and try again.";
 			}
 			# This doesnt actually get replaced with anything
 			$line =~ s/pkgconfversion\("(.+?)","(.+?)"\)//;
@@ -386,7 +445,7 @@ 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";
 		exit;
 	}