More paranoid _r protochecking. At least Tru64 and

[p5sagit/p5-mst-13.2.git] / hints / dec_osf.sh

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 134a3aa..dcaa283 100644 (file)
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -147,7 +147,8 @@ esac
 
 # we want dynamic fp rounding mode, and we want ieee exception semantics
 case "$isgcc" in
-gcc)   case "$_DEC_cc_style" in
+gcc)   ;;
+*)     case "$_DEC_cc_style" in
        new)    ccflags="$ccflags -fprm d -ieee"        ;;
        esac
        ;;
@@ -282,6 +283,12 @@ $define|true|[yY]*)
                usemymalloc='n'
                ;;
        esac
+       # These symbols are renamed in <time.h> so
+       # that the Configure hasproto doesn't see them.
+       d_asctime_r_proto="$define"
+       d_ctime_r_proto="$define"
+       d_gmtime_r_proto="$define"
+       d_localtime_r_proto="$define"
        ;;
 esac
 EOCBU
@@ -304,7 +311,6 @@ EOF
                exit 1
                ;;
        esac
-       d_Gconvert='sprintf((b),"%.*Lg",(n),(x))'
        ;;
 esac
 EOCBU
@@ -313,6 +319,35 @@ case "`/usr/sbin/sizer -v`" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac
 
+case "$loclibpth" in
+'')    ;;
+*)
+       needusrshlib=''
+       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
+       # 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
+       ;;
+esac
+
 #
 # Unset temporary variables no more needed.
 #