Change 16406 by jhi@alpha on 2002/05/05 00:23:16
The loclibpth is always set by Configure.
Affected files ...
.... //depot/perl/hints/dec_osf.sh#46 edit
Differences ...
==== //depot/perl/hints/dec_osf.sh#46 (text) ====
Index: perl/hints/dec_osf.sh
--- perl/hints/dec_osf.sh.~1~ Sat May 4 18:30:05 2002
+++ perl/hints/dec_osf.sh Sat May 4 18:30:05 2002
@@ -354,38 +354,34 @@
*[1-4].0*) d_modfl=undef ;; # must wait till 5.0
esac
-case "$loclibpth" in
-'') ;;
-*)
+# Keep those leading tabs.
needusrshlib=''
- case "$loclibpth" in
- '') ;;
- *) 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
- '') LD_LIBRARY_PATH=$p ;;
- *) LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$p ;;
- esac
- fi
- done
- 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
+ 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
+ '') LD_LIBRARY_PATH=$p ;;
+ *) LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$p ;;
+ esac
+ fi
+done
+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.
End of Patch.
