1 files changed, 71 insertions, 8 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 93e2317c3f..f57969bb44 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -27,6 +27,7 @@ RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
 SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
 VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
 
+
 # Now test for ISC and SCO, since it is has a braindamaged uname.
 #
 # We need to work around FreeBSD 1.1.5.1 
@@ -50,6 +51,8 @@ if [ "x$XREL" != "x" ]; then
             4.2MP)
                 if [ "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
                 else
                     echo "${MACHINE}-whatever-unixware2"; exit 0
                 fi
@@ -57,6 +60,11 @@ if [ "x$XREL" != "x" ]; then
             4.2)
                 echo "whatever-whatever-unixware1"; exit 0
                 ;;
+            5)
+                if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then
+                    echo "${MACHINE}-sco-unixware7"; exit 0
+                fi
+                ;;
         esac
     fi
 fi
@@ -187,6 +195,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "i860-intel-osf1"; exit 0
         ;;
 
+    Rhapsody:*)
+        echo "ppc-apple-rhapsody"; exit 0
+        ;;
+
     SunOS:5.*)
         echo "${MACHINE}-sun-solaris2"; exit 0
         ;;
@@ -311,7 +323,7 @@ else
 fi
 
 if [ "$SYSTEM" = "SunOS" ]; then
-  # assume output is "blah-blah C x.x"
+  # check for WorkShop C, expected output is "cc: blah-blah C x.x"
   CCVER=`(cc -V 2>&1) 2>/dev/null | \
         egrep -e '^cc: .* C [0-9]\.[0-9]' | \
         sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
@@ -328,6 +340,19 @@ if [ "$SYSTEM" = "SunOS" ]; then
   fi
 fi
 
+if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+  # check for Compaq C, expected output is "blah-blah C Vx.x"
+  CCCVER=`(ccc -V 2>&1) 2>/dev/null | \
+        egrep -e '.* C V[0-9]\.[0-9]' | \
+        sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'`
+  CCCVER=${CCCVER:-0}
+  if [ $CCCVER -gt 60 ]; then
+    CC=ccc      # overrides gcc!!! well, ccc outperforms inoticeably
+                # only on hash routines and des, otherwise gcc (2.95)
+                # keeps along rather tight...
+  fi
+fi
+
 GCCVER=${GCCVER:-0}
 CCVER=${CCVER:-0}
 
@@ -340,9 +365,6 @@ echo Operating system: $GUESSOS
 # script above so we end up with values in vars but that would take
 # more time that I want to waste at the moment
 case "$GUESSOS" in
-  alpha-*-linux2) OUT="alpha-gcc" ;;
-  ppc-*-linux2) OUT="linux-ppc" ;;
-  mips-*-linux?) OUT="linux-mips" ;;
   mips2-sgi-irix)
         CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
@@ -369,6 +391,23 @@ case "$GUESSOS" in
         options="$options -mips4"
         OUT="irix-mips3-$CC"
         ;;
+  alpha-*-linux2)
+        ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo`
+        case ${ISA:-generic} in
+        *[67])  OUT="linux-alpha+bwx-$CC" ;;
+        *)      OUT="linux-alpha-$CC" ;;
+        esac
+        if [ "$CC" = "gcc" ]; then
+            case ${ISA:-generic} in
+            EV5|EV45)           options="$options -mcpu=ev5";;
+            EV56|PCA56)         options="$options -mcpu=ev56";;
+            EV6|EV67|PCA57)     options="$options -mcpu=ev6";;
+            esac
+        fi
+        ;;
+  mips-*-linux?) OUT="linux-mips" ;;
+  ppc-*-linux2) OUT="linux-ppc" ;;
+  ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   sparc64-*-linux2)
         #Before we can uncomment following lines we have to wait at least
         #till 64-bit glibc for SPARC is operational:-(
@@ -413,17 +452,30 @@ case "$GUESSOS" in
   *-*-openbsd) OUT="OpenBSD" ;;
   *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
   *-*-osf) OUT="alpha-cc" ;;
-  *-*-unixware*) OUT="unixware-2.0" ;;
+  *-*-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" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
+  *-hpux1*)     OUT="hpux-parisc-$CC"
+                options="$options -D_REENTRANT" ;;
+  *-hpux)       OUT="hpux-parisc-$CC" ;;
   # these are all covered by the catchall below
-  # *-hpux*) OUT="hpux-$CC" ;;
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
+# See whether we can compile Atalla support
+if [ -f /usr/include/atasi.h ]
+then
+  options="$options -DATALLA"
+fi
+
 # gcc < 2.8 does not support -mcpu=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then
@@ -438,6 +490,17 @@ 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" ;;
@@ -484,14 +547,14 @@ fi
 # compiler for the platform ... in which case we add it on
 # the end ... otherwise we leave it off
 
-$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
+$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
 if [ $? = "0" ]; then
   OUT="$OUT-$CC"
 fi
 
 OUT="$PREFIX$OUT"
 
-$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null
+$PERL ./Configure LIST | grep "$OUT" > /dev/null
 if [ $? = "0" ]; then
   echo Configuring for $OUT