This commit was manufactured by cvs2svn to create branch

[oweals/openssl.git] / config

diff --git a/config b/config
index 29fc9cd4e03f34c17193bf0ec0571c085ae45cc2..36e820e4fea4cd3e66d680ca708ae100d35d8509 100755 (executable)
--- a/config
+++ b/config
@@ -23,6 +23,7 @@
 PREFIX=""
 SUFFIX=""
 TEST="false"
+EXE=""
 
 # pick up any command line args to config
 for i
@@ -81,7 +82,7 @@ if [ "x$XREL" != "x" ]; then
                esac
                ;;
            4.2)
-               echo "whatever-whatever-unixware1"; exit 0
+               echo "i386-whatever-unixware1"; exit 0
                ;;
            5)
                case "x${VERSION}" in
@@ -110,8 +111,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "m68k-apple-aux3"; exit 0
        ;;
 
-    AIX:*:[5-9]:*)
-       echo "${MACHINE}-ibm-aix5"; exit 0
+    AIX:[3456789]:4:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
+       ;;
+
+    AIX:*:[56789]:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
        ;;
 
     AIX:*)
@@ -284,6 +289,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-sysv4"; exit 0
        ;;
 
+    VOS:*:*:i786)
+     echo "i386-stratus-vos"; exit 0
+     ;;
+
+    VOS:*:*:*)
+     echo "hppa1.1-stratus-vos"; exit 0
+     ;;
+
     *:4*:R4*:m88k)
        echo "${MACHINE}-whatever-sysv4"; exit 0
        ;;
@@ -533,7 +546,10 @@ EOF
        ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`
        rm dummy dummy.c
        ;;
-  ppc64-*-linux2) OUT="linux-ppc64" ;;
+  ppc64-*-linux2)
+       #Use the standard target for PPC architecture until we create a
+       #special one for the 64bit architecture.
+       OUT="linux-ppc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -672,12 +688,23 @@ EOF
   *-*-UnixWare21*) OUT="unixware-2.1" ;;
   *-*-Unixware20*) OUT="unixware-2.0" ;;
   *-*-Unixware21*) OUT="unixware-2.1" ;;
+  *-*-vos)
+       options="$options no-threads no-shared no-asm no-dso"
+       EXE=".pm"
+       OUT="vos-$CC" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
   *-hpux1*)
-       if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
+       if [ $CC = "gcc" ];
+       then
+         if [ $GCC_BITS = "64" ]; then
            OUT="hpux64-parisc2-gcc"
+         else
+           OUT="hpux-parisc-gcc"
+         fi
+       else
+         OUT="hpux-parisc-$CC"
        fi
        KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
        KERNEL_BITS=${KERNEL_BITS:-32}
@@ -694,7 +721,9 @@ EOF
             fi
             OUT="hpux64-ia64-cc"
        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
-            OUT=${OUT:-"hpux-parisc2-${CC}"}
+            if [ "$CC" = "cc" ]; then
+               OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc?
+            fi
             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*."
@@ -704,43 +733,14 @@ 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
        options="$options -D_REENTRANT" ;;
   *-hpux)      OUT="hpux-parisc-$CC" ;;
-  *-aix5)
-       KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
-       KERNEL_BITS=${KERNEL_BITS:-32}
-       if [ $KERNEL_BITS -eq 64 ]; then
-           # we default to 64-bit because PKI performance is >3x better...
-           OBJECT_MODE=${OBJECT_MODE:-$KERNEL_BITS}
-       else
-           OBJECT_MODE=32
-       fi
-       OUT="aix-cc"
-       if [ "$CC" = "cc" -a $OBJECT_MODE -eq 64 ]; then
-           OUT="aix64-cc"
-           echo "WARNING! If you wish to build 32-bit kit, then you have to"
-           echo "         invoke './Configure aix-cc' *manually*."
-           if [ "$TEST" = "false" ]; then
-               echo "         You have ~5 seconds to press Ctrl-C to abort."
-               (stty -icanon min 0 time 50; read waste) < /dev/tty
-           fi
-       elif [ "$CC" = "gcc" ]; then
-           OUT="aix-gcc"
-       fi
-       ;;
-  *-aix)
-       if [ "$CC" = "gcc" ]; then
-           OUT="aix-gcc"
-       else
-           OUT="aix43-cc"
-       fi
-       ;;
   # these are all covered by the catchall below
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
@@ -819,8 +819,8 @@ fi
 
 if [ ".$PERL" = . ] ; then
        for i in . `echo $PATH | sed 's/:/ /g'`; do
-               if [ -f "$i/perl5" ] ; then
-                       PERL="$i/perl5"
+               if [ -f "$i/perl5$EXE" ] ; then
+                       PERL="$i/perl5$EXE"
                        break;
                fi;
        done
@@ -828,9 +828,9 @@ fi
 
 if [ ".$PERL" = . ] ; then
        for i in . `echo $PATH | sed 's/:/ /g'`; do
-               if [ -f "$i/perl" ] ; then
-                       if "$i/perl" -e 'exit($]<5.0)'; then
-                               PERL="$i/perl"
+               if [ -f "$i/perl$EXE" ] ; then
+                       if "$i/perl$EXE" -e 'exit($]<5.0)'; then
+                               PERL="$i/perl$EXE"
                                break;
                        fi;
                fi;