regenerated configure from configure.in

This commit is contained in:
Anthony Baxter 2004-11-06 04:45:33 +00:00
parent 8a92dd5866
commit eef2d3b2c5
1 changed files with 8 additions and 13 deletions

21
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.472 . # From configure.in Revision: 1.474 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4. # Generated by GNU Autoconf 2.59 for python 2.4.
# #
@ -10164,9 +10164,8 @@ then
fi fi
case "$enable_toolbox_glue" in case "$enable_toolbox_glue" in
yes) yes)
extra_frameworks="-framework CoreServices -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o" extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error" extra_undefs="-u _PyMac_Error"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define USE_TOOLBOX_OBJECT_GLUE 1 #define USE_TOOLBOX_OBJECT_GLUE 1
@ -10174,7 +10173,6 @@ _ACEOF
;; ;;
*) *)
extra_frameworks=""
extra_machdep_objs="" extra_machdep_objs=""
extra_undefs="" extra_undefs=""
;; ;;
@ -10186,12 +10184,11 @@ echo "${ECHO_T}$enable_toolbox_glue" >&6
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
Darwin/1.3*) Darwin/1.3*)
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc" LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*) Darwin/*)
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc" LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" LIBTOOL_CRUFT="$LIBTOOL_CRUFT"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
esac esac
@ -10409,22 +10406,20 @@ then
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys # -u libsys_s pulls in all symbols in libsys
Darwin/*) Darwin/*)
# -u __dummy makes the linker aware of the objc runtime # -u _PyMac_Error is needed to pull in the mac toolbox glue,
# in System.framework; otherwise, __objcInit (referenced in # which is
# crt1.o) gets erroneously defined as common, which breaks dynamic
# loading of any modules which reference it in System.framework.
# -u _PyMac_Error is needed to pull in the mac toolbox glue, which is
# not used by the core itself but which needs to be in the core so # not used by the core itself but which needs to be in the core so
# that dynamically loaded extension modules have access to it. # that dynamically loaded extension modules have access to it.
# -prebind is no longer used, because it actually seems to give a # -prebind is no longer used, because it actually seems to give a
# slowdown in stead of a speedup, maybe due to the large number of # slowdown in stead of a speedup, maybe due to the large number of
# dynamic loads Python does. # dynamic loads Python does.
LINKFORSHARED="$extra_undefs -framework System"
LINKFORSHARED="$extra_undefs"
if test "$enable_framework" if test "$enable_framework"
then then
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)' LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
fi fi
LINKFORSHARED="$LINKFORSHARED $extra_frameworks";; LINKFORSHARED="$LINKFORSHARED";;
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;