diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-07-16 20:17:04 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-07-16 20:17:04 (GMT) |
| commit | 0e6ea5d7151957338943896a08627c2f89a00cb0 (patch) | |
| tree | d70630168f60a2a43c2d6190cb37eb1780d36c1c /configure | |
| parent | 5e62ca4fea04ad7b349330c50dc11937ab3278f4 (diff) | |
| download | cpython-0e6ea5d7151957338943896a08627c2f89a00cb0.zip cpython-0e6ea5d7151957338943896a08627c2f89a00cb0.tar.gz cpython-0e6ea5d7151957338943896a08627c2f89a00cb0.tar.bz2 | |
fix framework install on Mac 10.4
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 64002 . +# From configure.in Revision: 64567 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.6. # @@ -657,6 +657,7 @@ VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK +ARCH_RUN_32BIT PYTHONFRAMEWORK PYTHONFRAMEWORKIDENTIFIER PYTHONFRAMEWORKDIR @@ -1897,6 +1898,9 @@ fi +ARCH_RUN_32BIT= + + 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; } @@ -4643,12 +4647,14 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; } UNIVERSAL_ARCH_FLAGS="" if test "$UNIVERSAL_ARCHS" = "32-bit" ; then UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" + ARCH_RUN_32BIT="" elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64" elif test "$UNIVERSAL_ARCHS" = "all" ; then UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64" + ARCH_RUN_32BIT="arch -386 -ppc" else { { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5 @@ -25314,6 +25320,7 @@ VERSION!$VERSION$ac_delim SOVERSION!$SOVERSION$ac_delim CONFIG_ARGS!$CONFIG_ARGS$ac_delim UNIVERSALSDK!$UNIVERSALSDK$ac_delim +ARCH_RUN_32BIT!$ARCH_RUN_32BIT$ac_delim PYTHONFRAMEWORK!$PYTHONFRAMEWORK$ac_delim PYTHONFRAMEWORKIDENTIFIER!$PYTHONFRAMEWORKIDENTIFIER$ac_delim PYTHONFRAMEWORKDIR!$PYTHONFRAMEWORKDIR$ac_delim @@ -25369,7 +25376,6 @@ BLDSHARED!$BLDSHARED$ac_delim CCSHARED!$CCSHARED$ac_delim LINKFORSHARED!$LINKFORSHARED$ac_delim CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim -SHLIBS!$SHLIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -25411,6 +25417,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SHLIBS!$SHLIBS$ac_delim USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim @@ -25434,7 +25441,7 @@ SRCDIRS!$SRCDIRS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |