*** openssl-0.9.7-stable-SNAP-20020612/config.orig	Thu Jun 13 10:56:20 2002
--- openssl-0.9.7-stable-SNAP-20020612/config	Thu Jun 13 12:02:29 2002
***************
*** 390,402 ****
  
  # 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 | head -1`
  if [ "$GCCVER" != "" ]; then
    CC=gcc
!   # then strip off whatever prefix Cygnus as well as GCC 3.1 prepends
!   # the number with...  Hopefully, this will work for any future prefixes
!   # as well.
!   GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z ()]*\-//'`
    # 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/'`
  else
--- 390,401 ----
  
  # figure out if gcc is available and if so we use it otherwise
  # we fallback to whatever cc does on the system
! GCCVER=`(gcc -dumpversion) 2>/dev/null`
  if [ "$GCCVER" != "" ]; then
    CC=gcc
!   # 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/'`
  else
***************
*** 403,409 ****
    CC=cc
  fi
  GCCVER=${GCCVER:-0}
! 
  if [ "$SYSTEM" = "SunOS" ]; then
    if [ $GCCVER -ge 30 ]; then
      # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
--- 402,419 ----
    CC=cc
  fi
  GCCVER=${GCCVER:-0}
! if [ "$SYSTEM" = "HP-UX" ];then
!   # By default gcc is a ILP32 compiler (with long long == 64).
!   GCC_BITS="32"
!   if [ $GCCVER -ge 30 ]; then
!     # PA64 support only came in with gcc 3.0.x.
!     # We look for the preprocessor symbol __LP64__ indicating
!     # 64bit bit long and pointer.  sizeof(int) == 32 on HPUX64.
!     if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then
!       GCC_BITS="64"
!     fi
!   fi
! fi
  if [ "$SYSTEM" = "SunOS" ]; then
    if [ $GCCVER -ge 30 ]; then
      # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
***************
*** 661,667 ****
    RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
    *-siemens-sysv4) OUT="SINIX" ;;
    *-hpux1*)
! 	OUT="hpux-parisc-$CC"
  	KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
  	KERNEL_BITS=${KERNEL_BITS:-32}
  	CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
--- 671,686 ----
    RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
    *-siemens-sysv4) OUT="SINIX" ;;
    *-hpux1*)
! 	if [ $CC = "gcc" ];
! 	then
! 	  if [ $GCC_BITS = "64" ]; then
! 	    OUT="hpux64-parisc-gcc"
! 	  else
! 	    OUT="hpux-parisc-gcc"
! 	  fi
! 	else
! 	  OUT="hpux-parisc-$CC"
! 	fi
  	KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
  	KERNEL_BITS=${KERNEL_BITS:-32}
  	CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`