Fix for issue #8175: ensure that configure --with-universal-archs=all
works on osx 10.5
diff --git a/configure b/configure
index ed92794..9ff45f5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 79353 .
+# From configure.in Revision: 80188 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -660,8 +660,6 @@
ARCH_RUN_32BIT
LIPO_32BIT_FLAGS
LIPO_64BIT_FLAGS
-UNIVERSAL_ARCH32_FLAGS
-UNIVERSAL_ARCH64_FLAGS
PYTHONFRAMEWORK
PYTHONFRAMEWORKIDENTIFIER
PYTHONFRAMEWORKDIR
@@ -1928,8 +1926,6 @@
UNIVERSAL_ARCHS="32-bit"
-
-
{ echo "$as_me:$LINENO: checking for --with-universal-archs" >&5
echo $ECHO_N "checking for --with-universal-archs... $ECHO_C" >&6; }
@@ -4741,24 +4737,18 @@
elif test "$UNIVERSAL_ARCHS" = "all" ; then
ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
- UNIVERSAL_ARCH32_FLAGS="-arch i386 -arch ppc"
- UNIVERSAL_ARCH64_FLAGS="-arch x86_64 -arch ppc64"
LIPO_32BIT_FLAGS="-extract i386 -extract ppc7400"
LIPO_64BIT_FLAGS="-extract x86_64 -extract ppc64"
elif test "$UNIVERSAL_ARCHS" = "intel" ; then
ARCH_RUN_32BIT="/usr/bin/arch -i386"
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
- UNIVERSAL_ARCH32_FLAGS="-arch i386"
- UNIVERSAL_ARCH64_FLAGS="-arch x86_64"
LIPO_32BIT_FLAGS="-extract i386"
LIPO_64BIT_FLAGS="-extract x86_64"
elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
- UNIVERSAL_ARCH32_FLAGS="-arch i386 -arch ppc"
- UNIVERSAL_ARCH64_FLAGS="-arch x86_64"
LIPO_32BIT_FLAGS="-extract i386 -extract ppc7400"
LIPO_64BIT_FLAGS="-extract x86_64"
@@ -25891,8 +25881,6 @@
ARCH_RUN_32BIT!$ARCH_RUN_32BIT$ac_delim
LIPO_32BIT_FLAGS!$LIPO_32BIT_FLAGS$ac_delim
LIPO_64BIT_FLAGS!$LIPO_64BIT_FLAGS$ac_delim
-UNIVERSAL_ARCH32_FLAGS!$UNIVERSAL_ARCH32_FLAGS$ac_delim
-UNIVERSAL_ARCH64_FLAGS!$UNIVERSAL_ARCH64_FLAGS$ac_delim
PYTHONFRAMEWORK!$PYTHONFRAMEWORK$ac_delim
PYTHONFRAMEWORKIDENTIFIER!$PYTHONFRAMEWORKIDENTIFIER$ac_delim
PYTHONFRAMEWORKDIR!$PYTHONFRAMEWORKDIR$ac_delim
@@ -25944,6 +25932,8 @@
LIBTOOL_CRUFT!$LIBTOOL_CRUFT$ac_delim
SO!$SO$ac_delim
LDSHARED!$LDSHARED$ac_delim
+BLDSHARED!$BLDSHARED$ac_delim
+CCSHARED!$CCSHARED$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -25985,8 +25975,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-BLDSHARED!$BLDSHARED$ac_delim
-CCSHARED!$CCSHARED$ac_delim
LINKFORSHARED!$LINKFORSHARED$ac_delim
CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
SHLIBS!$SHLIBS$ac_delim
@@ -26013,7 +26001,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5