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 fac0cb3561c36dcf31152a11dd05a9215f9d330b..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);
 
@@ -45,6 +46,14 @@ sub extend_pkg_path()
 sub pkgconfig_get_include_dirs($$$;$)
 {
        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 for module \033[1;32m$module\033[0m... ";
@@ -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
        {
@@ -83,6 +102,14 @@ sub pkgconfig_get_include_dirs($$$;$)
 sub pkgconfig_get_lib_dirs($$$;$)
 {
        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 for module \033[1;32m$module\033[0m... ";
@@ -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,10 @@ 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;
 
@@ -152,7 +190,7 @@ sub translate_functions($$)
                        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;
@@ -185,13 +223,16 @@ sub translate_functions($$)
                        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;