Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

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

diff --git a/make/utilities.pm b/make/utilities.pm
index ebca57b686db343f6c09485d9b66902c0d9d6c6c..baba584ad240754030525f0d60fcaae7ec975302 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -29,6 +29,7 @@ use warnings FATAL => qw(all);
 
 use Exporter 'import';
 use POSIX;
+use File::Temp;
 use Getopt::Long;
 use Fcntl;
 our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
@@ -76,6 +77,7 @@ sub promptstring($$$$$)
 sub make_rpath($;$)
 {
        my ($executable, $module) = @_;
+       return "" if defined $ENV{DISABLE_RPATH};
        chomp(my $data = `$executable`);
        my $output = "";
        while ($data =~ /-L(\S+)/)
@@ -83,10 +85,10 @@ sub make_rpath($;$)
                my $libpath = $1;
                if (!exists $already_added{$libpath})
                {
-                       print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n";
+                       print "Adding runtime 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;
+               $output .= "-Wl,-rpath -Wl,$libpath -L$libpath ";
                $data =~ s/-L(\S+)//;
        }
        return $output;
@@ -94,6 +96,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";
@@ -317,6 +320,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;
@@ -393,13 +405,14 @@ sub translate_functions($$)
                        my $tmpfile;
                        do
                        {
-                               $tmpfile = tmpnam();
+                               $tmpfile = File::Temp::tmpnam();
                        } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
                        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\("(.+?)","(.+?)","(.+?)"\)/)
@@ -445,7 +458,7 @@ sub translate_functions($$)
                print "\nMake sure you have pkg-config installed\n";
                print "\nIn the case of gnutls configuration errors on debian,\n";
                print "Ubuntu, etc, you should ensure that you have installed\n";
-               print "gnutls-bin as well as gnutls-dev and gnutls.\n";
+               print "gnutls-bin as well as libgnutls-dev and libgnutls.\n";
                exit;
        }
        else