From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 28 Feb 2000 06:31:08 +0000 (+0000)
Subject: The search for static _s-suffixex libs was broken;
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=09ea5ba94740a5f50c4291872402c49958d16eda;p=p5sagit%2Fp5-mst-13.2.git

The search for static _s-suffixex libs was broken;
add -L/lib/pa20_64 only iff there.

p4raw-id: //depot/cfgperl@5315
---

diff --git a/Configure b/Configure
index 1341a6e..315ada8 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Feb 28 08:07:01 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Mon Feb 28 08:28:06 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -3740,6 +3740,7 @@ for thislib in $libswanted; do
 		xxx=$thisdir/lib${thislib}_s$_a
 	        $test -f "$xxx" && eval $libscheck
 		$test -f "$xxx" && libstyle=static
+		$test -f "$xxx" && thislib=${thislib}_s
 	    fi
 	    if test ! -f "$xxx"; then
 		xxx=$thisdir/Slib$thislib$_a
diff --git a/hints/hpux.sh b/hints/hpux.sh
index ba6efa0..8d02637 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -160,7 +160,7 @@ EOM
 
     ccflags="$ccflags +DD64"
     ldflags="$ldflags +DD64"
-    loclibpth="$loclibpth /lib/pa20_64"
+    test -d /lib/pa20_64 && loclibpth="$loclibpth /lib/pa20_64"
     libscheck='case "`file $xxx`" in
 *LP64*|*PA-RISC2.0*) ;;
 *) xxx=/no/64-bit$xxx ;;
@@ -181,12 +181,12 @@ esac'
     libswanted="$*"
 
     case "`$cc -v 2>&1`" in
-    *gcc*) ccflags="$ccflags -L/lib/pa20_64" ;;
+    *gcc*) test -d /lib/pa20_64 && ccflags="$ccflags -L/lib/pa20_64" ;;
     esac
     ;;
 *) loclibpth="$loclibpth /lib/pa1.1"
     case "`$cc -v 2>&1`" in
-    *gcc*) ccflags="$ccflags -L/lib/pa20_64" ;;
+    *gcc*) test -d /lib/pa20_64 && ccflags="$ccflags -L/lib/pa20_64" ;;
     esac
     ;;
 esac