summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2014-03-19 11:30:07 +0100
committerNicholas Clark <nick@ccl4.org>2014-03-20 15:46:08 +0100
commita5dbacf870d1302d609ce1aa791d9bf35e3d443b (patch)
tree65582f4219e01b0bc97b38bfa3984fa9c8fd9140
parent87a7cbadd8678833337412bca174d352a90db6d4 (diff)
downloadperl-a5dbacf870d1302d609ce1aa791d9bf35e3d443b.tar.gz
The linux hints file should only look for -lgdbm_compat if -lgdbm is wanted.
Previously they would unconditionally add gdbm_compat to the list of wanted libraries. This is unhelpful if the user has passed Configure arguments to constrain the library search to avoid libgdbm.so, because Configure would still end up finding libgdbm_compat.so, which at best is not useful without libgdbm.so, and at worse could have the same problems that caused the user to avoid libgdbm.so (eg not compatible with the current compiler flags)
-rw-r--r--hints/linux.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/hints/linux.sh b/hints/linux.sh
index 4c2c5f57a8..956adfca25 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -58,7 +58,11 @@ shift
libswanted="$*"
# Debian 4.0 puts ndbm in the -lgdbm_compat library.
-libswanted="$libswanted gdbm_compat"
+echo $libs
+if echo " $libswanted " | grep -q ' gdbm '; then
+ # Only add if gdbm is in libswanted.
+ libswanted="$libswanted gdbm_compat"
+fi
# Configure may fail to find lstat() since it's a static/inline
# function in <sys/stat.h>.