Make {i2v,v2i}_ASN1_BIT_STRING global.

[openssl.git] / config

diff --git a/config b/config
index 79ce83aac3d6b8f462fa5b49309af06d0583b5d5..a0dc457c55899173c6682e9f3a45623bb2c7b9b8 100755 (executable)
--- a/config
+++ b/config
@@ -134,7 +134,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "$HPUXVER" in
            1[0-9].*)   # HPUX 10 and 11 targets are unified
-               echo "${MACHINE}-hp-hpux10"; exit 0
+               echo "${MACHINE}-hp-hpux1x"; exit 0
                ;;
            *)
                echo "${MACHINE}-hp-hpux"; exit 0
@@ -410,9 +410,10 @@ if [ "$SYSTEM" = "HP-UX" ];then
   GCC_BITS="32"
   if [ $GCCVER -ge 30 ]; then
     # PA64 support only came in with gcc 3.0.x.
-    # We look for the preprocessor symbol __LP64__ indicating
-    # 64bit bit long and pointer.  sizeof(int) == 32 on HPUX64.
-    if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then
+    # We check if the preprocessor symbol __LP64__ is defined...
+    if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
+      : # __LP64__ has slipped through, it therefore is not defined
+    else
       GCC_BITS="64"
     fi
   fi
@@ -682,15 +683,8 @@ EOF
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
   *-hpux1*)
-       if [ $CC = "gcc" ];
-       then
-         if [ $GCC_BITS = "64" ]; then
-           OUT="hpux64-parisc-gcc"
-         else
-           OUT="hpux-parisc-gcc"
-         fi
-       else
-         OUT="hpux-parisc-$CC"
+       if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
+           OUT="hpux64-parisc2-gcc"
        fi
        KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
        KERNEL_BITS=${KERNEL_BITS:-32}
@@ -707,9 +701,7 @@ EOF
             fi
             OUT="hpux64-ia64-cc"
        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
-            if [ "$CC" = "cc" ]; then
-               OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc?
-            fi
+            OUT=${OUT:-"hpux-parisc2-${CC}"}
             if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
                echo "WARNING! If you wish to build 64-bit library then you have to"
                echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
@@ -719,9 +711,9 @@ EOF
                fi
             fi
        elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU
-            :
+            OUT="hpux-parisc-${CC}
        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU
-            :
+            OUT="hpux-parisc-${CC}
        else                                    # Motorola(?) CPU
             OUT="hpux-$CC"
        fi