Integrate ectest.c (which does not yet do anything).

[openssl.git] / config

diff --git a/config b/config
index c97655daaa9e0afe53257be4688e5ae93c985557..a6411528afab6ce31202fc03d4bab854a78525b5 100755 (executable)
--- a/config
+++ b/config
@@ -20,6 +20,31 @@
 # Be as similar to the output of config.guess/config.sub
 # as possible.
 
+PREFIX=""
+SUFFIX=""
+TEST="false"
+
+# pick up any command line args to config
+for i
+do
+case "$i" in 
+-d*) PREFIX="debug-";;
+-t*) TEST="true";;
+-h*) TEST="true"; cat <<EOF
+Usage: config [options]
+ -d    Add a debug- prefix to machine choice.
+ -t    Test mode, do not run the Configure perl script.
+ -h    This help.
+
+Any other text will be passed to the Configure perl script.
+See INSTALL for instructions.
+
+EOF
+;;
+*) options=$options" $i" ;;
+esac
+done
+
 # First get uname entries that we use below
 
 MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
@@ -208,7 +233,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        ;;
 
     Darwin:*)
-       echo "ppc-apple-darwin"; exit 0
+       case "$MACHINE" in
+           Power*)
+               echo "ppc-apple-darwin${VERSION}"
+               ;;
+           *)
+               echo "i386-apple-darwin${VERSION}"
+               ;;
+       esac
+       exit 0
        ;;
 
     SunOS:5.*)
@@ -300,31 +333,6 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-PREFIX=""
-SUFFIX=""
-TEST="false"
-
-# pick up any command line args to config
-for i
-do
-case "$i" in 
--d*) PREFIX="debug-";;
--t*) TEST="true";;
--h*) TEST="true"; cat <<EOF
-Usage: config [options]
- -d    Add a debug- prefix to machine choice.
- -t    Test mode, do not run the Configure perl script.
- -h    This help.
-
-Any other text will be passed to the Configure perl script.
-See INSTALL for instructions.
-
-EOF
-;;
-*) options=$options" $i" ;;
-esac
-done
-
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
 GCCVER=`(gcc --version) 2>/dev/null`
@@ -403,7 +411,9 @@ case "$GUESSOS" in
        echo "WARNING! If you wish to build 64-bit library, then you have to"
        echo "         invoke './Configure irix64-mips4-$CC' *manually*."
        echo "         Type return if you want to continue, Ctrl-C to abort."
-       read waste < /dev/tty
+       if [ "$TEST" = "false" ]; then
+         read waste < /dev/tty
+       fi
         CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         CPU=${CPU:-0}
         if [ $CPU -ge 5000 ]; then
@@ -447,7 +457,8 @@ 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" ;;
+  ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
+  i386-apple-darwin*) OUT="darwin-i386-cc" ;;
   sparc64-*-linux2)
        #Before we can uncomment following lines we have to wait at least
        #till 64-bit glibc for SPARC is operational:-(
@@ -474,7 +485,9 @@ EOF
                echo "WARNING! If you wish to build 64-bit library, then you have to"
                echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
                echo "         Type return if you want to continue, Ctrl-C to abort."
-               read waste < /dev/tty
+               if [ "$TEST" = "false" ]; then
+                 read waste < /dev/tty
+               fi
        fi
        OUT="solaris-sparcv9-$CC" ;;
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;