diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-06-29 19:59:53 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-06-29 19:59:53 +0200 |
| commit | 107806bd1db9d6b1480b3a98e991611b4270f281 (patch) | |
| tree | 952d35a9f9a48d22cec5aeedbdeccf98a52d13c7 /make/utilities.pm | |
| parent | 68dba8dc27303b118fb5c7266a8459ca8ef68366 (diff) | |
| parent | 1cf1f1fba94c6749f7b4d02c8138349ba75c9c1a (diff) | |
Merge pull request #878 from SaberUK/insp20+fix-minor-issues
Fix various small problems with configure.
Diffstat (limited to 'make/utilities.pm')
| -rw-r--r-- | make/utilities.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make/utilities.pm b/make/utilities.pm index ebca57b68..8c8ac0d49 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -76,6 +76,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 +84,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; @@ -400,6 +401,7 @@ sub translate_functions($$) close TF; my $replace = `perl $tmpfile`; chomp($replace); + unlink($tmpfile); $line =~ s/eval\("(.+?)"\)/$replace/; } while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/) @@ -445,7 +447,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 |