Branch: Tag:

2005-06-09

2005-06-09 13:47:14 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Added ABI check to library directory scan.

Rev: src/configure.in:1.888

1: - AC_REVISION("$Id: configure.in,v 1.887 2005/06/09 09:12:10 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.888 2005/06/09 13:47:14 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
2319:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.887 2005/06/09 09:12:10 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.888 2005/06/09 13:47:14 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2357:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.887 2005/06/09 09:12:10 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.888 2005/06/09 13:47:14 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2366:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.887 2005/06/09 09:12:10 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.888 2005/06/09 13:47:14 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
2472:    d="$dd$suff"    AC_MSG_CHECKING($d)    if test -d "$d/." ; then +  bad_abi="" +  for f in "$d"/* no; do +  if test -f "$f"; then +  filetype=`file "$f" 2>/dev/null | sed -e 's/.*://'` +  if echo "$filetype" | grep "$with_abi" >/dev/null; then +  bad_abi=""; +  break; +  elif echo "$filetype" | grep "32" >/dev/null; then +  bad_abi=32; +  elif echo "$filetype" | grep "64" >/dev/null; then +  bad_abi=64; +  fi +  fi +  done +  if test "x$bad_abi" = "x"; then :; else +  AC_MSG_RESULT([no, contains only $bad_abi-bit ABI files]) +  continue; +  fi    case " $LDFLAGS " in    *\ -L$d\ -R$d\ * | *\ -R$d\ -L$d\ *)    AC_MSG_RESULT(already added)
4888:   #else   #error Unsupported compiler   #endif -  ], [], [pike_cv_machine_code_arch=ia32], []) +  ], [], [ +  pike_cv_machine_code_arch=ia32 +  ], [])    AC_TRY_COMPILE([   #if defined(__GNUC__)   #if !defined(sparc) && !defined(__sparc__) && !defined(__sparc)
4897:   #else   #error Unsupported compiler   #endif -  ], [], [pike_cv_machine_code_arch=sparc], []) +  ], [], [ +  pike_cv_machine_code_arch=sparc +  ], [])    AC_TRY_COMPILE([   #if defined(__GNUC__)   #if !defined(__ppc__) && !defined(__powerpc__) && !defined(_POWER)
4906:   #else   #error Unsupported compiler   #endif -  ], [], [pike_cv_machine_code_arch=ppc32], []) +  ], [], [ +  pike_cv_machine_code_arch=ppc32 +  ], [])    ])    AC_MSG_RESULT($pike_cv_machine_code_arch)    if test "x$pike_cv_machine_code_arch" = xunknown ; then
4914:    else    with_machine_code="yes"    AC_DEFINE(PIKE_USE_MACHINE_CODE) +  case "x$pike_cv_machine_code_arch" in +  xia32) +  # Force gmp to build for ia32 and not for x86_64. +  BUNDLE_FLAGS="$BUNDLE_FLAGS --host=i486" +  ;; +  esac    fi   fi