Add missing item SSL_ERROR_WANT_CONNECT.
[oweals/openssl.git] / config
diff --git a/config b/config
index c89e69a17c9bbeae82de8350476300d23bb4978d..c69ea6dfce086b9310a5c8db25cf5311ea3caa1e 100755 (executable)
--- a/config
+++ b/config
@@ -49,10 +49,18 @@ if [ "x$XREL" != "x" ]; then
                echo "whatever-whatever-sco5"; exit 0
                ;;
            4.2MP)
-               if [ "x$VERSION" = "x2.1.1" ]; then
+               if [ "x$VERSION" = "x2.01" ]; then
+                   echo "${MACHINE}-whatever-unixware201"; exit 0
+               elif [ "x$VERSION" = "x2.02" ]; then
+                   echo "${MACHINE}-whatever-unixware202"; exit 0
+               elif [ "x$VERSION" = "x2.03" ]; then
+                   echo "${MACHINE}-whatever-unixware203"; exit 0
+               elif [ "x$VERSION" = "x2.1.1" ]; then
                    echo "${MACHINE}-whatever-unixware211"; exit 0
                elif [ "x$VERSION" = "x2.1.2" ]; then
                    echo "${MACHINE}-whatever-unixware212"; exit 0
+               elif [ "x$VERSION" = "x2.1.3" ]; then
+                   echo "${MACHINE}-whatever-unixware213"; exit 0
                else
                    echo "${MACHINE}-whatever-unixware2"; exit 0
                fi
@@ -71,10 +79,22 @@ fi
 # Now we simply scan though... In most cases, the SYSTEM info is enough
 #
 case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+    MPE/iX:*)
+       MACHINE=`echo "$MACHINE" | sed -e 's/-/_/g'`
+       echo "parisc-hp-MPE/iX"; exit 0
+       ;;
     A/UX:*)
        echo "m68k-apple-aux3"; exit 0
        ;;
 
+    AIX:[3456789]:4:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
+       ;;
+
+    AIX:*:[56789]:*)
+       echo "${MACHINE}-ibm-aix43"; exit 0
+       ;;
+
     AIX:*)
        echo "${MACHINE}-ibm-aix"; exit 0
        ;;
@@ -164,7 +184,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         ;;
 
     NetBSD:*:*:*386*)
-        echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
+        echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
        ;;
 
     NetBSD:*)
@@ -181,11 +201,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 
     QNX:*)
        case "$VERSION" in
-           423)
-               echo "${MACHINE}-qssl-qnx32"
+           4*)
+               echo "${MACHINE}-whatever-qnx4"
                ;;
            *)
-               echo "${MACHINE}-qssl-qnx"
+               echo "${MACHINE}-whatever-qnx"
                ;;
        esac
        exit 0
@@ -200,7 +220,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        ;;
 
     SunOS:5.*)
-       echo "${MACHINE}-sun-solaris2"; exit 0
+       echo "${MACHINE}-whatever-solaris2"; exit 0
        ;;
 
     SunOS:*)
@@ -247,6 +267,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
        ;;
 
+    NEWS-OS:4.*)
+       echo "mips-sony-newsos4"; exit 0;
+       ;;
+
 esac
 
 #
@@ -292,8 +316,6 @@ TEST="false"
 for i
 do
 case "$i" in 
-# shared library support (behnke@trustcenter.de)
--shared) SHARED=true;;
 -d*) PREFIX="debug-";;
 -t*) TEST="true";;
 -h*) TEST="true"; cat <<EOF
@@ -387,10 +409,16 @@ case "$GUESSOS" in
        ;;
   mips4-sgi-irix64)
        echo "WARNING! If you wish to build 64-bit library, then you have to"
-       echo "         invoke './Configre irix64-mips4-$CC' *manually*."
-       echo "         Type Ctrl-C if you don't want to continue."
+       echo "         invoke './Configure irix64-mips4-$CC' *manually*."
+       echo "         Type return if you want to continue, Ctrl-C to abort."
        read waste < /dev/tty
-       options="$options -mips4"
+        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        CPU=${CPU:-0}
+        if [ $CPU -ge 5000 ]; then
+                options="$options -mips4"
+        else
+                options="$options -mips3"
+        fi
        OUT="irix-mips3-$CC"
        ;;
   alpha-*-linux2)
@@ -417,11 +445,11 @@ case "$GUESSOS" in
        #till 64-bit glibc for SPARC is operational:-(
        #echo "WARNING! If you wish to build 64-bit library, then you have to"
        #echo "         invoke './Configure linux64-sparcv9' *manually*."
-       #echo "         Type Ctrl-C if you don't want to continue."
+       #echo "         Type return if you want to continue, Ctrl-C to abort."
        #read waste < /dev/tty
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)
-       KARCH=`awk '/type/{print$3}' /proc/cpuinfo`
+       KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
        case ${KARCH:-sun4} in
        sun4u*) OUT="linux-sparcv9" ;;
        sun4m)  OUT="linux-sparcv8" ;;
@@ -429,21 +457,22 @@ case "$GUESSOS" in
        *)      OUT="linux-sparcv7" ;;
        esac ;;
   arm*-*-linux2) OUT="linux-elf-arm" ;;
+  s390-*-linux2) OUT="linux-s390" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
-  sun4u*-sun-solaris2)
+  sun4u*-*-solaris2)
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
        if [ "$ISA64" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then
                echo "WARNING! If you wish to build 64-bit library, then you have to"
                echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
-               echo "         Type Ctrl-C if you don't want to continue."
+               echo "         Type return if you want to continue, Ctrl-C to abort."
                read waste < /dev/tty
        fi
        OUT="solaris-sparcv9-$CC" ;;
-  sun4m-sun-solaris2)  OUT="solaris-sparcv8-$CC" ;;
-  sun4d-sun-solaris2)  OUT="solaris-sparcv8-$CC" ;;
-  sun4*-sun-solaris2)  OUT="solaris-sparcv7-$CC" ;;
-  *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
+  sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
+  sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
+  sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
+  *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
@@ -460,9 +489,12 @@ case "$GUESSOS" in
   *-*-unixware7) OUT="unixware-7" ;;
   *-*-UnixWare7) OUT="unixware-7" ;;
   *-*-Unixware7) OUT="unixware-7" ;;
-  *-*-unixware[1-2]*) OUT="unixware-2.0" ;;
-  *-*-UnixWare[1-2]*) OUT="unixware-2.0" ;;
-  *-*-Unixware[1-2]*) OUT="unixware-2.0" ;;
+  *-*-unixware20*) OUT="unixware-2.0" ;;
+  *-*-unixware21*) OUT="unixware-2.1" ;;
+  *-*-UnixWare20*) OUT="unixware-2.0" ;;
+  *-*-UnixWare21*) OUT="unixware-2.1" ;;
+  *-*-Unixware20*) OUT="unixware-2.0" ;;
+  *-*-Unixware21*) OUT="unixware-2.1" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
@@ -472,6 +504,7 @@ case "$GUESSOS" in
   # these are all covered by the catchall below
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
+  mips-sony-newsos4) OUT="newsos4-gcc" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
@@ -481,16 +514,6 @@ then
   options="$options -DATALLA"
 fi
 
-#get some basic shared lib support (behnke@trustcenter.de)
-case "$OUT" in
-   solaris-*-gcc)
-       if  [ "$SHARED" = "true" ] 
-        then
-         options="$options -DPIC -fPIC"
-        fi
-     ;;
-esac
-
 # gcc < 2.8 does not support -mcpu=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then
@@ -505,17 +528,6 @@ then
   sleep 5
   OUT=linux-sparcv8
 fi
-# To start with $OUT is never i86pc-sun-solaris2. Secondly why
-# ban *all* assembler implementation if it can't stand only one,
-# SHA-0 implementation.
-#if [ "$OUT" = "i86pc-sun-solaris2" ]
-#then
-#  ASM=`as -V /dev/null 2>&1`
-#  case "$ASM" in
-#    GNU*) ;;
-#    *) options="$options no-asm" ; echo "WARNING: You need the GNU assembler to use OpenSSL assembler code." ; echo "Sun as is not supported on Solaris x86." ;;
-#  esac
-#fi
 
 case "$GUESSOS" in
   i386-*) options="$options 386" ;;