mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
Merged revisions 65033 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65033 | benjamin.peterson | 2008-07-16 15:17:04 -0500 (Wed, 16 Jul 2008) | 1 line fix framework install on Mac 10.4 ........
This commit is contained in:
parent
000b0dcb8a
commit
6794aa3cb3
11
configure
vendored
11
configure
vendored
|
@ -657,6 +657,7 @@ VERSION
|
|||
SOVERSION
|
||||
CONFIG_ARGS
|
||||
UNIVERSALSDK
|
||||
ARCH_RUN_32BIT
|
||||
PYTHONFRAMEWORK
|
||||
PYTHONFRAMEWORKIDENTIFIER
|
||||
PYTHONFRAMEWORKDIR
|
||||
|
@ -1892,6 +1893,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; }
|
||||
|
@ -4588,12 +4592,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
|
||||
|
@ -24985,6 +24991,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
|
||||
|
@ -25040,7 +25047,6 @@ LINKFORSHARED!$LINKFORSHARED$ac_delim
|
|||
CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
|
||||
SHLIBS!$SHLIBS$ac_delim
|
||||
USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
|
||||
SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
@ -25082,6 +25088,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
|
||||
USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
|
||||
LDLAST!$LDLAST$ac_delim
|
||||
THREADOBJ!$THREADOBJ$ac_delim
|
||||
|
@ -25102,7 +25109,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` = 18; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
@ -92,6 +92,9 @@ AC_ARG_ENABLE(universalsdk,
|
|||
])
|
||||
AC_SUBST(UNIVERSALSDK)
|
||||
|
||||
ARCH_RUN_32BIT=
|
||||
AC_SUBST(ARCH_RUN_32BIT)
|
||||
|
||||
UNIVERSAL_ARCHS="32-bit"
|
||||
AC_MSG_CHECKING(for --with-universal-archs)
|
||||
AC_ARG_WITH(universal-archs,
|
||||
|
@ -859,12 +862,14 @@ yes)
|
|||
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
|
||||
AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
|
||||
|
|
Loading…
Reference in a new issue