diff options
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 21 insertions, 21 deletions
@@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.279 +# From configure.in Revision: 1.280 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -3045,16 +3045,16 @@ echo "$ac_t""$enable_toolbox_glue" 1>&6 case $ac_sys_system/$ac_sys_release in - Darwin/1.4*) + Darwin/1.3*) 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="-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 -U $ns_undef_sym" - LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" + 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)';; esac @@ -3070,8 +3070,8 @@ then # in the build location. 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";; + 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 #define WITH_NEXT_FRAMEWORK 1 @@ -3144,14 +3144,14 @@ then hp*|HP*) LDSHARED="ld -b";; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; DYNIX/ptx*) LDSHARED="ld -G";; - Darwin/1.4*) + Darwin/1.3*) LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -flat_namespace -undefined suppress" + LDSHARED="$LDSHARED -undefined suppress" fi ;; Darwin/*) LDSHARED='$(CC) $(LDFLAGS) -bundle' @@ -3160,7 +3160,7 @@ then LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -undefined suppress" + LDSHARED="$LDSHARED -flat_namespace -undefined suppress" fi ;; Linux*) LDSHARED="gcc -shared";; dgux*) LDSHARED="ld -G";; diff --git a/configure.in b/configure.in index 34a0806..68d352e 100644 --- a/configure.in +++ b/configure.in @@ -670,16 +670,16 @@ AC_MSG_RESULT($enable_toolbox_glue) AC_SUBST(LIBTOOL_CRUFT) case $ac_sys_system/$ac_sys_release in - Darwin/1.4*) + Darwin/1.3*) 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="-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 -U $ns_undef_sym" - LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" + 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)';; esac @@ -694,8 +694,8 @@ then # in the build location. 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";; + 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) AC_MSG_RESULT(yes) @@ -759,14 +759,14 @@ then hp*|HP*) LDSHARED="ld -b";; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; DYNIX/ptx*) LDSHARED="ld -G";; - Darwin/1.4*) + Darwin/1.3*) LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -flat_namespace -undefined suppress" + LDSHARED="$LDSHARED -undefined suppress" fi ;; Darwin/*) LDSHARED='$(CC) $(LDFLAGS) -bundle' @@ -775,7 +775,7 @@ then LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -undefined suppress" + LDSHARED="$LDSHARED -flat_namespace -undefined suppress" fi ;; Linux*) LDSHARED="gcc -shared";; dgux*) LDSHARED="ld -G";; |