X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=8ef151e93f2fd4ab4232e19e3925a006ee454df4;hb=522b859adcc800ddbbe593fba580633bb305644f;hp=7c3569f70cc0515d02e07e900bfce3f733e1d6a6;hpb=a4349beab060ae6e975b158829344a74589cf57b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 7c3569f..8ef151e 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -73,12 +73,12 @@ gcc)	if [ "X$gccversion" = "X" ]; then
 	    # Done too late in Configure if hinted
 	    gccversion=`$cc --version | sed 's/.*(GCC) *//'`
 	fi
-	set $gcc_version
-	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 2 \) \) \); then
+	set $gccversion
+	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 3 \) \) \); then
 	    cat >&4 <<EOF
 
-*** Your cc seems to be gcc and its version ($gcc_version) seems to be
-*** less than 2.95.2.  This is not a good idea since old versions of gcc
+*** Your cc seems to be gcc and its version ($gccversion) seems to be
+*** less than 2.95.3.  This is not a good idea since old versions of gcc
 *** are known to produce buggy code when compiling Perl (and no doubt for
 *** other programs, too).
 ***
@@ -357,14 +357,10 @@ case "`/usr/sbin/sizer -v`" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac
 
-# Keep those leading tabs.
-	needusrshlib=''
+# Keep that leading tab.
 	old_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 for p in $loclibpth
 do
-	if test -n "`ls $p/libdb.so* 2>/dev/null`"; then
-	    needusrshlib=yes
-	fi
 	if test -d $p; then
 	    echo "Appending $p to LD_LIBRARY_PATH." >& 4
 	    case "$LD_LIBRARY_PATH" in
@@ -377,14 +373,6 @@ case "$LD_LIBRARY_PATH" in
 "$old_LD_LIBRARY_PATH") ;;
 *) echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 ;;
 esac
-# This is evil but I can't think of a nice workaround:
-# the /usr/shlib/libdb.so needs to be seen first,
-# or running Configure will fail.
-if test -n "$needusrshlib"; then
-    echo "Prepending /usr/shlib to loclibpth." >& 4
-    loclibpth="/usr/shlib $loclibpth"
-    echo "loclibpth is now $loclibpth." >& 4
-fi
 
 #
 # Unset temporary variables no more needed.