Make the test more portable.

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

diff --git a/hints/hpux.sh b/hints/hpux.sh
index 4d50717..ce15f55 100644 (file)
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -92,12 +92,15 @@ EOM
        cppminus='-'
        cpplast='-'
     fi
-    # For HP's ANSI C compiler, up to "+O3" is safe for everything
-    # except shared libraries (PIC code).  Max safe for PIC is "+O2".
-    # Setting both causes innocuous warnings.
-    #optimize='+O3'
-    #cccdlflags='+z +O2'
-    optimize='-O'
+    case "$optimize" in
+       # For HP's ANSI C compiler, up to "+O3" is safe for everything
+       # except shared libraries (PIC code).  Max safe for PIC is "+O2".
+       # Setting both causes innocuous warnings.
+       '')     optimize='-O'
+               #optimize='+O3'
+               #cccdlflags='+z +O2'
+               ;;
+    esac
     cc=cc
     ;;
 esac
@@ -140,32 +143,10 @@ else
 fi
 
 # Do this right now instead of the delayed callback unit approach.
-case "$use64bitint" in
-$define|true|[yY]*)
-    case "$ccisgcc" in
-    "$define") ld=$cc ;;
-    *) ld=/usr/bin/ld ;;
-    esac
-    ar=/usr/bin/ar
-    full_ar=$ar
-
-    case "$ccisgcc" in
-    "$define") ;;
-    *) # The strict ANSI mode (-Aa) doesn't like the LL suffixes.
-       case "$ccflags" in
-       *-Ae*)
-           echo "(Changing from strict ANSI compilation to extended because of 64-bitintness)"
-           ccflags=`echo $ccflags|sed 's@ -Aa @ -Ae @g'`
-           ;;
-       *) ccflags="$ccflags -Ae" ;;
-       esac
-       ;;
-    esac    
-    ;;
-esac
-
-# Do this right now instead of the delayed callback unit approach.
 case "$use64bitall" in
+$define|true|[yY]*) use64bitint="$define" ;;
+esac
+case "$use64bitint" in
 $define|true|[yY]*)
     if [ "$xxOsRevMajor" -lt 11 ]; then
                cat <<EOM >&4
@@ -198,6 +179,22 @@ EOM
 *LP64*|*PA-RISC2.0*) ;;
 *) xxx=/no/64-bit$xxx ;;
 esac'
+    if test -n "$ccisgcc" -o -n "$gccversion"; then
+       ld="$cc"
+    else       
+       ld=/usr/bin/ld
+    fi
+    ar=/usr/bin/ar
+    full_ar=$ar
+
+    if test -z "$ccisgcc" -a -z "$gccversion"; then
+       # The strict ANSI mode (-Aa) doesn't like the LL suffixes.
+       ccflags=`echo " $ccflags "|sed 's@ -Aa @ @g'`
+       case "$ccflags" in
+       *-Ae*) ;;
+       *) ccflags="$ccflags -Ae" ;;
+       esac
+    fi
 
     set `echo " $libswanted " | sed -e 's@ dl @ @'`
     libswanted="$*"
@@ -209,7 +206,7 @@ case "$ccisgcc" in
 # Even if you use gcc, prefer the HP math library over the GNU one.
 "$define") test -d /lib/pa1.1 && ccflags="$ccflags -L/lib/pa1.1" ;;
 esac
-
+    
 case "$ccisgcc" in
 "$define") ;;
 *)  case "`getconf KERNEL_BITS 2>/dev/null`" in
@@ -243,7 +240,10 @@ libswanted="$*"
 # ccdlflags="-Wl,-E -Wl,-B,immediate,-B,nonfatal $ccdlflags"
 ccdlflags="-Wl,-E -Wl,-B,deferred $ccdlflags"
 
-usemymalloc='y'
+case "$usemymalloc" in
+'') usemymalloc='y' ;;
+esac
+
 alignbytes=8
 # For native nm, you need "-p" to produce BSD format output.
 nm_opt='-p'
@@ -390,14 +390,15 @@ case "$uselargefiles" in
        # but we cheat for now.
        ccflags="$ccflags -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
-        # The strict ANSI mode (-Aa) doesn't like large files.
-       case "$ccflags" in
-       -Aa*)
-           echo "(Changing from strict ANSI compilation to extended because of large files)"
-           ccflags=`echo $ccflags|sed 's@ -Aa @ -Ae @'`
-           ;;
-       *)  ccflags="$ccflags -Ae" ;;
-       esac
+        if test -z "$ccisgcc" -a -z "$gccversion"; then
+           # The strict ANSI mode (-Aa) doesn't like large files.
+           ccflags=`echo " $ccflags "|sed 's@ -Aa @ @g'`
+           case "$ccflags" in
+           *-Ae*) ;;
+           *) ccflags="$ccflags -Ae" ;;
+           esac
+       fi
+
        ;;
 esac
 EOCBU