Use same name in the definition as in the header file declaration :-/

[openssl.git] / config

diff --git a/config b/config
index fe8108d4391e4997a98728a64314ab79f69d0336..306af22654bf382312c9cce81bbf1a3bc58c77cb 100755 (executable)
--- a/config
+++ b/config
@@ -114,8 +114,19 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-lynx-lynxos"; exit 0
        ;;
 
+    BSD/OS:4.*)  # BSD/OS always says 386
+       echo "i486-whatever-bsdi4"; exit 0
+       ;;
+
     BSD/386:*:*:*486*|BSD/OS:*:*:*:*486*)
-       echo "i486-whatever-bsdi"; exit 0
+        case `/sbin/sysctl -n hw.model` in
+           Pentium*)
+                echo "i586-whatever-bsdi"; exit 0
+                ;;
+            *)
+                echo "i386-whatever-bsdi"; exit 0
+                ;;
+            esac;
        ;;
 
     BSD/386:*|BSD/OS:*)
@@ -201,8 +212,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-unknown-ultrix"; exit 0
        ;;
 
-    SINIX*)
-       echo "${MACHINE}-sni-sysv4"; exit 0
+    SINIX*|ReliantUNIX*)
+       echo "${MACHINE}-siemens-sysv4"; exit 0
+       ;;
+
+    POSIX-BC*)
+       echo "${MACHINE}-siemens-sysv4"; exit 0   # Here, $MACHINE == "BS2000"
        ;;
 
     machten:*)
@@ -235,6 +250,9 @@ fi
 # Now NeXT
 ISNEXT=`hostinfo 2>/dev/null`
 case "$ISNEXT" in
+    *'NeXT Mach 3.3'*)
+       echo "whatever-next-nextstep3.3"; exit 0
+       ;;
     *NeXT*)
        echo "whatever-next-nextstep"; exit 0
        ;;
@@ -286,9 +304,9 @@ else
   if [ "$SYSTEM" = "SunOS" ]
   then
    case `cc -V 2>&1` in
-    *4*) CC=sc4;;
-    *5*) CC=sc5;;
-    *) CC=cc;;
+    *4*) CC=cc;;
+    *5*) CC=cc;;
+    *) CC=sc3;;
    esac
   fi
 fi
@@ -304,6 +322,9 @@ echo Operating system: $GUESSOS
 case "$GUESSOS" in
   alpha-*-linux2) OUT="alpha-gcc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
+  mips-*-linux?) OUT="linux-mips" ;;
+  sparc-*-linux2) OUT="linux-sparc" ;;
+  sparc64-*-linux2) OUT="linux-sparc64" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;;
@@ -320,9 +341,12 @@ case "$GUESSOS" in
   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
   *-*-openbsd) OUT="OpenBSD" ;;
+  *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
   *-*-osf) OUT="alpha-cc" ;;
   *-*-unixware*) OUT="unixware-2.0" ;;
-  *-sni-sysv4) OUT="SINIX" ;;
+  BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
+  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
+  *-siemens-sysv4) OUT="SINIX" ;;
   # these are all covered by the catchall below
   # *-hpux*) OUT="hpux-$CC" ;;
   # *-aix) OUT="aix-$CC" ;;
@@ -333,7 +357,10 @@ esac
 # gcc < 2.8 does not support -mcpu=ultrasparc
 if [ "$OUT" = solaris-usparc-gcc ]
 then
- if [ `echo "$GCCVER" | sed 's/.*version //;s/\.//;s/\..*//'` -lt 28 ]
+ GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`"
+ GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`"
+ echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x"
+ if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ]
  then
   OUT=solaris-usparc-oldgcc
  fi
@@ -343,6 +370,14 @@ case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
+for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 rsa sha
+do
+  if [ ! -d crypto/$i ]
+  then
+    options="$options no-$i"
+  fi
+done
+
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi