diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-05 00:23:16 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-05 00:23:16 +0000 |
| commit | a4ccfa7629128e4b79e21f856eb1cbf44ef54e7e (patch) | |
| tree | fd422fa3e88b368f5b8b885b0bd4540fdc8b0862 /hints | |
| parent | 327745dce425cf1e0a6939fc06d5fa7fbfa1fca7 (diff) | |
| download | perl-a4ccfa7629128e4b79e21f856eb1cbf44ef54e7e.tar.gz | |
The loclibpth is always set by Configure.
p4raw-id: //depot/perl@16406
Diffstat (limited to 'hints')
| -rw-r--r-- | hints/dec_osf.sh | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh index c5889495cf..7706141ff2 100644 --- a/hints/dec_osf.sh +++ b/hints/dec_osf.sh @@ -354,38 +354,34 @@ case "`/usr/sbin/sizer -v`" in *[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. |