Proritise cached value above a search

[user/henk/code/inspircd.git] / make / utilities.pm

diff --git a/make/utilities.pm b/make/utilities.pm
index 10d36bbcf9dd545b478198f4687d1d4feadbae9e..982337577c59fbf4a81a96b8cdf779170064087c 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,5 +1,6 @@
 package make::utilities;
 use Exporter 'import';
+use make::configure;
 use POSIX;
 @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions);
 
@@ -11,9 +12,9 @@ use POSIX;
 
 my %already_added = ();
 
-sub make_rpath($)
+sub make_rpath($;$)
 {
-       my ($executable) = @_;
+       my ($executable, $module) = @_;
        chomp($data = `$executable`);
        my $output = "";
        while ($data =~ /-L(\S+)/)
@@ -21,7 +22,7 @@ sub make_rpath($)
                $libpath = $1;
                if (!exists $already_added{$libpath})
                {
-                       print "Adding extra library path \033[1;32m$libpath\033[0m ...\n";
+                       print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n";
                        $already_added{$libpath} = 1;
                }
                $output .= "-Wl,--rpath -Wl,$libpath -L$libpath ";
@@ -42,12 +43,20 @@ sub extend_pkg_path()
        }
 }
 
-sub pkgconfig_get_include_dirs($$$)
+sub pkgconfig_get_include_dirs($$$;$)
 {
-       my ($packagename, $headername, $defaults) = @_;
+       my ($packagename, $headername, $defaults, $module) = @_;
+
+       if (exists $config{$key})
+       {
+               my $key = "default_includedir_$packagename";
+               $ret = $config{$key};
+               return $ret;
+       }
+
        extend_pkg_path();
 
-       print "Locating include directory for package \033[1;32m$packagename\033[0m ... ";
+       print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
        $ret = `pkg-config --cflags $packagename 2>/dev/null`;
        if ((!defined $ret) || ($ret eq ""))
@@ -71,7 +80,17 @@ sub pkgconfig_get_include_dirs($$$)
        chomp($ret);
        if (($ret eq " ") || (!defined $ret))
        {
-               print "\033[1;32mUsing defaults\033[0m\n";
+               my $key = "default_includedir_$packagename";
+               if (exists $config{$key})
+               {
+                       $ret = $config{$key};
+               }
+               else
+               {
+                       $headername =~ s/^\///;
+                       promptstring("path to the directory containing $headername", $key, "/usr/include");
+                       $ret = $config{$key};
+               }
        }
        else
        {
@@ -80,12 +99,20 @@ sub pkgconfig_get_include_dirs($$$)
        return $ret;
 }
 
-sub pkgconfig_get_lib_dirs($$$)
+sub pkgconfig_get_lib_dirs($$$;$)
 {
-       my ($packagename, $libname, $defaults) = @_;
+       my ($packagename, $libname, $defaults, $module) = @_;
+
+       if (exists $config{$key})
+       {
+               my $key = "default_libdir_$packagename";
+               $ret = $config{$key};
+               return $ret;
+       }
+
        extend_pkg_path();
 
-       print "Locating library directory for package \033[1;32m$packagename\033[0m ... ";
+       print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
        $ret = `pkg-config --libs $packagename 2>/dev/null`;
        if ((!defined $ret) || ($ret eq ""))
@@ -110,7 +137,17 @@ sub pkgconfig_get_lib_dirs($$$)
        chomp($ret);
        if (($ret eq " ") || (!defined $ret))
        {
-               print "\033[1;32mUsing defaults\033[0m\n";
+               my $key = "default_libdir_$packagename";
+               if (exists $config{$key})
+               {
+                       $ret = $config{$key};
+               }
+               else
+               {
+                       $libname =~ s/^\///;
+                       promptstring("path to the directory containing $libname", $key, "/usr/lib");
+                       $ret = $config{$key};
+               }
        }
        else
        {
@@ -123,9 +160,12 @@ sub pkgconfig_get_lib_dirs($$$)
 # to functions within these modules at configure time.
 sub translate_functions($$)
 {
+       my ($line,$module) = @_;
+
        eval
        {
-               my ($line,$module) = @_;
+               $module =~ /modules*\/(.+?)$/;
+               $module = $1;
 
                # This is only a cursory check, just designed to catch casual accidental use of backticks.
                # There are pleanty of ways around it, but its not supposed to be for security, just checking
@@ -138,19 +178,19 @@ sub translate_functions($$)
                }
                while ($line =~ /exec\("(.+?)"\)/)
                {
-                       print "Executing program ... \033[1;32m$1\033[0m\n";
+                       print "Executing program for module \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n";
                        my $replace = `$1`;
                        chomp($replace);
                        $line =~ s/exec\("(.+?)"\)/$replace/;
                }
                while ($line =~ /eval\("(.+?)"\)/)
                {
-                       print "Evaluating perl code ... ";
+                       print "Evaluating perl code for module \033[1;32m$module\033[0m ... ";
                        my $tmpfile;
                        do
                        {
                                $tmpfile = tmpnam();
-                       } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL, 0700);
+                       } 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 TF $1;
                        close TF;
@@ -160,36 +200,39 @@ sub translate_functions($$)
                }
                while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
                {
-                       my $replace = pkgconfig_get_lib_dirs($1, $2, $3);
+                       my $replace = pkgconfig_get_lib_dirs($1, $2, $3, $module);
                        $line =~ s/pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/$replace/;
                }
                while ($line =~ /pkgconflibs\("(.+?)","(.+?)",""\)/)
                {
-                       my $replace = pkgconfig_get_lib_dirs($1, $2, "");
+                       my $replace = pkgconfig_get_lib_dirs($1, $2, "", $module);
                        $line =~ s/pkgconflibs\("(.+?)","(.+?)",""\)/$replace/;
                }
                while ($line =~ /pkgconfincludes\("(.+?)","(.+?)",""\)/)
                {
-                       my $replace = pkgconfig_get_include_dirs($1, $2, "");
+                       my $replace = pkgconfig_get_include_dirs($1, $2, "", $module);
                        $line =~ s/pkgconfincludes\("(.+?)","(.+?)",""\)/$replace/;
                }
                while ($line =~ /pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/)
                {
-                       my $replace = pkgconfig_get_include_dirs($1, $2, $3);
+                       my $replace = pkgconfig_get_include_dirs($1, $2, $3, $module);
                        $line =~ s/pkgconfincludes\("(.+?)","(.+?)","(.+?)"\)/$replace/;
                }
                while ($line =~ /rpath\("(.+?)"\)/)
                {
-                       my $replace = make_rpath($1);
+                       my $replace = make_rpath($1,$module);
                        $line =~ s/rpath\("(.+?)"\)/$replace/;
                }
-               return $line;
        };
        if ($@)
        {
                print "\n\nConfiguration failed. The following error occured:\n\n$@\n";
                exit;
        }
+       else
+       {
+               return $line;
+       }
 }
 
 1;