[Python-checkins] CVS: python/dist/src configure.in,1.280,1.281 configure,1.271,1.272
Jack Jansen
jackjansen@users.sourceforge.net
2001年11月14日 03:00:00 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv20934
Modified Files:
configure.in configure
Log Message:
OSX tests used specific version numbers to test for new features and
used the default Darwin/* for the old code. Reversed those tests so
that compatibility code is in a switch leg with a specific version and
newer systems take the default leg.
This should allow Python to build on OSX 10.1.1 (which jumps from Darwin/1.4
to Darwin/5.1 due to a new numbering scheme).
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.280
retrieving revision 1.281
diff -C2 -d -r1.280 -r1.281
*** configure.in 2001年11月09日 17:50:52 1.280
--- configure.in 2001年11月14日 10:59:57 1.281
***************
*** 671,684 ****
AC_SUBST(LIBTOOL_CRUFT)
case $ac_sys_system/$ac_sys_release in
! Darwin/1.4*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
--- 671,684 ----
AC_SUBST(LIBTOOL_CRUFT)
case $ac_sys_system/$ac_sys_release in
! Darwin/1.3*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
***************
*** 695,700 ****
case $ac_sys_system/$ac_sys_release in
! Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
! Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
esac
AC_DEFINE(WITH_NEXT_FRAMEWORK)
--- 695,700 ----
case $ac_sys_system/$ac_sys_release in
! Darwin/1.3*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
! Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
esac
AC_DEFINE(WITH_NEXT_FRAMEWORK)
***************
*** 760,764 ****
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
DYNIX/ptx*) LDSHARED="ld -G";;
! Darwin/1.4*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
--- 760,764 ----
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
DYNIX/ptx*) LDSHARED="ld -G";;
! Darwin/1.3*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
***************
*** 767,771 ****
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Darwin/*)
--- 767,771 ----
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -undefined suppress"
fi ;;
Darwin/*)
***************
*** 776,780 ****
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -undefined suppress"
fi ;;
Linux*) LDSHARED="gcc -shared";;
--- 776,780 ----
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Linux*) LDSHARED="gcc -shared";;
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.271
retrieving revision 1.272
diff -C2 -d -r1.271 -r1.272
*** configure 2001年11月09日 17:50:51 1.271
--- configure 2001年11月14日 10:59:57 1.272
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.279
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.280
# Guess values for system-dependent variables and create Makefiles.
***************
*** 3046,3059 ****
case $ac_sys_system/$ac_sys_release in
! Darwin/1.4*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
--- 3046,3059 ----
case $ac_sys_system/$ac_sys_release in
! Darwin/1.3*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
ns_undef_sym='_environ'
! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
! LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
***************
*** 3071,3076 ****
case $ac_sys_system/$ac_sys_release in
! Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
! Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
esac
cat >> confdefs.h <<\EOF
--- 3071,3076 ----
case $ac_sys_system/$ac_sys_release in
! Darwin/1.3*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
! Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
esac
cat >> confdefs.h <<\EOF
***************
*** 3145,3149 ****
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
DYNIX/ptx*) LDSHARED="ld -G";;
! Darwin/1.4*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
--- 3145,3149 ----
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
DYNIX/ptx*) LDSHARED="ld -G";;
! Darwin/1.3*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
***************
*** 3152,3156 ****
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Darwin/*)
--- 3152,3156 ----
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -undefined suppress"
fi ;;
Darwin/*)
***************
*** 3161,3165 ****
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -undefined suppress"
fi ;;
Linux*) LDSHARED="gcc -shared";;
--- 3161,3165 ----
else
# No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Linux*) LDSHARED="gcc -shared";;