summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Baxter <anthonybaxter@gmail.com>2004-11-06 04:45:33 (GMT)
committerAnthony Baxter <anthonybaxter@gmail.com>2004-11-06 04:45:33 (GMT)
commiteef2d3b2c5754307b378c27664d5eb7eb184c669 (patch)
treed3a597e226baa7eccc26e782fe0e8bf0fcba2ad0
parent8a92dd5866061211d80ee4f61ae091aa4e0fdb5d (diff)
downloadcpython-eef2d3b2c5754307b378c27664d5eb7eb184c669.zip
cpython-eef2d3b2c5754307b378c27664d5eb7eb184c669.tar.gz
cpython-eef2d3b2c5754307b378c27664d5eb7eb184c669.tar.bz2
regenerated configure from configure.in
-rwxr-xr-xconfigure21
1 files changed, 8 insertions, 13 deletions
diff --git a/configure b/configure
index 36679b5..a9ce402 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.472 .
+# From configure.in Revision: 1.474 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4.
#
@@ -10164,9 +10164,8 @@ then
fi
case "$enable_toolbox_glue" in
yes)
- extra_frameworks="-framework CoreServices -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o"
- extra_undefs="-u __dummy -u _PyMac_Error"
+ extra_undefs="-u _PyMac_Error"
cat >>confdefs.h <<\_ACEOF
#define USE_TOOLBOX_OBJECT_GLUE 1
@@ -10174,7 +10173,6 @@ _ACEOF
;;
*)
- extra_frameworks=""
extra_machdep_objs=""
extra_undefs=""
;;
@@ -10186,12 +10184,11 @@ echo "${ECHO_T}$enable_toolbox_glue" >&6
case $ac_sys_system/$ac_sys_release in
Darwin/1.3*)
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' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
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' -compatibility_version $(VERSION) -current_version $(VERSION)';;
esac
@@ -10409,22 +10406,20 @@ then
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
- # -u __dummy makes the linker aware of the objc runtime
- # in System.framework; otherwise, __objcInit (referenced in
- # 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
+ # -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
# that dynamically loaded extension modules have access to it.
# -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
# dynamic loads Python does.
- LINKFORSHARED="$extra_undefs -framework System"
+
+ LINKFORSHARED="$extra_undefs"
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
fi
- LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
+ LINKFORSHARED="$LINKFORSHARED";;
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;