Eliminate a warning: BN_mod_inverse() returns a (BIGNUM *) and remove and

[openssl.git] / config

diff --git a/config b/config
index c04acf7f5a2f39ce24be7ac2746009bcfb8795de..8a47ca102dea40a04948bab9a0f934c30fd92e7e 100755 (executable)
--- a/config
+++ b/config
@@ -114,22 +114,25 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-lynx-lynxos"; exit 0
        ;;
 
-    BSD/OS:4.*)
-       echo "${MACHINE}-whatever-bsdi4"; 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:*)
        echo "${MACHINE}-whatever-bsdi"; exit 0
        ;;
 
-    FreeBSD:3*:*:*)
-       echo "${MACHINE}-whatever-freebsd3"; exit 0
-       ;;
-
     FreeBSD:*:*:*386*)
         case `sysctl -n hw.model` in
            Pentium*)
@@ -243,7 +246,7 @@ fi
 # Now NeXT
 ISNEXT=`hostinfo 2>/dev/null`
 case "$ISNEXT" in
-    *NeXT Mach 3.3*)
+    *'NeXT Mach 3.3'*)
        echo "whatever-next-nextstep3.3"; exit 0
        ;;
     *NeXT*)
@@ -324,8 +327,7 @@ case "$GUESSOS" in
   sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
   *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
-  alpha*-*-freebsd3) OUT="FreeBSD-alpha" ;;
-  *-freebsd3) OUT="FreeBSD-elf" ;;
+  alpha*-*-freebsd) OUT="FreeBSD-alpha" ;;
   *-freebsd) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
@@ -353,17 +355,23 @@ then
  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
+ case "$GCCVERMAJOR" in
+   egcs*)
+     ;;
+   *)
+     if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ]
+     then
+       OUT=solaris-usparc-oldgcc
+     fi
+     ;;
+  esac
 fi
 
 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
+for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
 do
   if [ ! -d crypto/$i ]
   then