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

diff --git a/make/utilities.pm b/make/utilities.pm
index 7a45ebb3e..f280a2798 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,14 +1,33 @@
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 package make::utilities;
+
+require 5.8.0;
+
+use strict;
+use warnings FATAL => qw(all);
+
 use Exporter 'import';
 use POSIX;
 use Getopt::Long;
-@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck);
+use Fcntl;
+our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck);
 
 # Parse the output of a *_config program,
 # 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 = ();
 
@@ -18,22 +37,22 @@ sub promptstring($$$$$)
 	my $var;
 	if (!$main::interactive)
 	{
-		undef $opt_commandlineswitch;
+		my $opt_commandlineswitch;
 		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 "")
@@ -46,17 +65,17 @@ sub promptstring($$$$$)
 sub make_rpath($;$)
 {
 	my ($executable, $module) = @_;
-	chomp($data = `$executable`);
+	chomp(my $data = `$executable`);
 	my $output = "";
 	while ($data =~ /-L(\S+)/)
 	{
-		$libpath = $1;
+		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 ";
+		$output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath;
 		$data =~ s/-L(\S+)//;
 	}
 	return $output;
@@ -81,28 +100,29 @@ 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... ";
-		$ret = $main::config{$key};
-		print "\033[1;32m$ret\033[0m (cached)\n";
+		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 "\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... ";
 
-	$v = `pkg-config --modversion $packagename 2>/dev/null`;
-	$ret = `pkg-config --cflags $packagename 2>/dev/null`;
+	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/;
-		$find = $1;
+		my $find = $1;
 		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
@@ -143,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;
@@ -152,17 +172,17 @@ sub pkgconfig_get_include_dirs($$$;$)
 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/\-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;
+	$version1 =~ s/[a-z]//g;
+	$version2 =~ s/[a-z]//g;
 	my @v1 = split('\.', $version1);
 	my @v2 = split('\.', $version2);
-	for ($curr = 0; $curr < scalar(@v1); $curr++)
+	for (my $curr = 0; $curr < scalar(@v1); $curr++)
 	{
 		if ($v1[$curr] < $v2[$curr])
 		{
@@ -178,9 +198,9 @@ 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... ";
 
-	$v = `pkg-config --modversion $packagename 2>/dev/null`;
+	my $v = `pkg-config --modversion $packagename 2>/dev/null`;
 	if (defined $v)
 	{
 		chomp($v);
@@ -189,17 +209,20 @@ 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;
 		}
 	}
-	print "\033[1;32mNo (not found)\033[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 "\e[1;32mNo (not found)\e[0m\n";
+	return 1;
 }
 
 sub pkgconfig_get_lib_dirs($$$;$)
@@ -209,28 +232,29 @@ 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... ";
-		$ret = $main::config{$key};
-		print "\033[1;32m$ret\033[0m (cached)\n";
+		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 "\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... ";
 
-	$v = `pkg-config --modversion $packagename 2>/dev/null`;
-	$ret = `pkg-config --libs $packagename 2>/dev/null`;
+	my $v = `pkg-config --modversion $packagename 2>/dev/null`;
+	my $ret = `pkg-config --libs $packagename 2>/dev/null`;
 
+	my $foo = "";
 	if ((!defined $v) || ($v eq ""))
 	{
 		$foo = `locate "$libname" | head -n 1`;
 		$foo =~ /(.+)\Q$libname\E/;
-		$find = $1;
+		my $find = $1;
 		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
@@ -266,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;
@@ -298,24 +322,30 @@ sub translate_functions($$)
 		}
 		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);
 			$line =~ s/exec\("(.+?)"\)/$replace/;
 		}
+		while ($line =~ /execruntime\("(.+?)"\)/)
+		{
+			$line =~ s/execruntime\("(.+?)"\)/`$1`/;
+		}
 		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`;
 			chomp($replace);
+			unlink($tmpfile);
 			$line =~ s/eval\("(.+?)"\)/$replace/;
 		}
 		while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
@@ -327,7 +357,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\("(.+?)","(.+?)"\)//;
@@ -350,12 +380,13 @@ sub translate_functions($$)
 		while ($line =~ /rpath\("(.+?)"\)/)
 		{
 			my $replace = make_rpath($1,$module);
+			$replace = "" if ($^O =~ /darwin/i);
 			$line =~ s/rpath\("(.+?)"\)/$replace/;
 		}
 	};
 	if ($@)
 	{
-		$err = $@;
+		my $err = $@;
 		$err =~ s/at .+? line \d+.*//g;
 		print "\n\nConfiguration failed. The following error occured:\n\n$err\n";
 		exit;