Initial record tracing code. Print out all fields in SSL/TLS records

[openssl.git] / config

diff --git a/config b/config
index 37f86b068a6ecf46bece55b962bf8f59884896ea..851a1611368482f2c93e0922d26c476514c99be6 100755 (executable)
--- a/config
+++ b/config
@@ -411,25 +411,18 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-if [ -z "$GCCVER" ]; then
-       GCCVER=`(gcc -dumpversion) 2>/dev/null`
-fi
-if [ "$GCCVER" != "" ]; then
-  # then strip off whatever prefix egcs prepends the number with...
-  # Hopefully, this will work for any future prefixes as well.
-  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
-  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-  # does give us what we want though, so we use that.  We just just the
-  # major and minor version numbers.
-  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-fi
-
 # Only set CC if not supplied already
-if [ -z "$CC" ]; then
-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
+if [ -z "$CROSS_COMPILE$CC" ]; then
+  GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
   if [ "$GCCVER" != "" ]; then
+    # then strip off whatever prefix egcs prepends the number with...
+    # Hopefully, this will work for any future prefixes as well.
+    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
+    # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
+    # does give us what we want though, so we use that.  We just just the
+    # major and minor version numbers.
+    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
     CC=gcc
   else
     CC=cc
@@ -545,7 +538,7 @@ case "$GUESSOS" in
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   ppc-apple-darwin*)
        ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
-       if [ "$ISA64" = "1" ]; then
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
            echo "         invoke './Configure darwin64-ppc-cc' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
@@ -553,10 +546,14 @@ case "$GUESSOS" in
              (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
-       OUT="darwin-ppc-cc" ;;
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-ppc-cc"
+       else
+           OUT="darwin-ppc-cc"
+       fi ;;
   i?86-apple-darwin*)
        ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
-       if [ "$ISA64" = "1" ]; then
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
            echo "         invoke './Configure darwin64-x86_64-cc' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
@@ -564,7 +561,17 @@ case "$GUESSOS" in
              (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
-       OUT="darwin-i386-cc" ;;
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-x86_64-cc"
+       else
+           OUT="darwin-i386-cc"
+       fi ;;
+  armv6+7-*-iphoneos)
+       options="$options -arch%20armv6 -arch%20armv7"
+       OUT="iphoneos-cross" ;;
+  *-*-iphoneos)
+       options="$options -arch%20${MACHINE}"
+       OUT="iphoneos-cross" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
        case ${ISA:-generic} in
@@ -671,7 +678,7 @@ case "$GUESSOS" in
   sun4[uv]*-*-solaris2)
        OUT="solaris-sparcv9-$CC"
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
-       if [ "$ISA64" != "" ]; then
+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
            if [ "$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*."
@@ -701,13 +708,16 @@ case "$GUESSOS" in
                fi
            fi
        fi
+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="solaris64-sparcv9-$CC"
+       fi
        ;;
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
   *86*-*-solaris2)
        ISA64=`(isalist) 2>/dev/null | grep amd64`
-       if [ "$ISA64" != "" ]; then
+       if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
            OUT="solaris64-x86_64-$CC"
        else
            OUT="solaris-x86-$CC"
@@ -851,10 +861,9 @@ if [ -n "$CONFIG_OPTIONS" ]; then
   options="$options $CONFIG_OPTIONS"
 fi
 
-if [ -z "$CONFIG_SKIP_NOEXECSTACK" ]; then
-  ! expr "$options" : '.*no\-asm' > /dev/null && \
-  ($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
- grep \\--noexecstack) 2>&1 > /dev/null && \
+if expr "$options" : '.*no\-asm' > /dev/null; then :; else
+  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
+  grep \\--noexecstack >/dev/null && \
   options="$options -Wa,--noexecstack"
 fi