New function OPENSSL_issetugid(). Needs more work.

[openssl.git] / config

diff --git a/config b/config
index 8eec5c1e11c530f7a934bab25673f5520268d8d5..c97655daaa9e0afe53257be4688e5ae93c985557 100755 (executable)
--- a/config
+++ b/config
@@ -126,6 +126,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-linux1"; exit 0
        ;;
 
+    GNU*)
+       echo "hurd-x86"; exit 0;
+       ;;
+
     LynxOS:*)
        echo "${MACHINE}-lynx-lynxos"; exit 0
        ;;
@@ -203,6 +207,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "ppc-apple-rhapsody"; exit 0
        ;;
 
+    Darwin:*)
+       echo "ppc-apple-darwin"; exit 0
+       ;;
+
     SunOS:5.*)
        echo "${MACHINE}-whatever-solaris2"; exit 0
        ;;
@@ -393,10 +401,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)
@@ -433,12 +447,13 @@ EOF
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
+  ppc-apple-darwin) OUT="darwin-ppc-cc" ;;
   sparc64-*-linux2)
        #Before we can uncomment following lines we have to wait at least
        #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)
@@ -450,6 +465,7 @@ EOF
        *)      OUT="linux-sparcv7" ;;
        esac ;;
   arm*-*-linux2) OUT="linux-elf-arm" ;;
+  s390-*-linux2) OUT="linux-s390" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4u*-*-solaris2)
@@ -457,7 +473,7 @@ EOF
        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" ;;
@@ -536,6 +552,27 @@ do
   fi
 done
 
+# Discover Kerberos 5 (since it's still a prototype, we don't
+# do any guesses yet, that's why this section is commented away.
+#if [ -d /usr/kerberos ]; then
+#    krb5_dir=/usr/kerberos
+#    if [ \( -f $krb5_dir/lib/libgssapi_krb5.a -o -f $krb5_dir/lib/libgssapi_krb5.so* \)\
+#      -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
+#      -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
+#      -a \( -f $krb5_dir/lib/libk5crypto.a -o -f $krb5_dir/lib/libk5crypto.so* \)\
+#      -a \( -f $krb5_dir/include/krb5.h \) ]; then
+#      options="$options --with-krb5-flavor=MIT"
+#    fi
+#elif [ -d /usr/heimdal ]; then
+#    krb5_dir=/usr/heimdal
+#    if [ \( -f $krb5_dir/lib/libgssapi.a -o -f $krb5_dir/lib/libgssapi.so* \)\
+#      -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\
+#      -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\
+#      -a \( -f $krb5_dir/include/krb5.h \) ]; then
+#      options="$options --with-krb5-flavor=Heimdal"
+#    fi
+#fi
+
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi