build _functools and _locale into the core library

diff --git a/configure b/configure
index 17b83670c28d77510f622508ff2ebba0c7978eda..ca9eac25e15ac01fb4c1b0167071a1fe267d4a72 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 72504 .
+# From configure.in Revision: 72800 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -13524,7 +13524,7 @@ then
                # slowdown in stead of a speedup, maybe due to the large number of
                # dynamic loads Python does.
 
-               LINKFORSHARED="$extra_undefs"
+               LINKFORSHARED="$extra_undefs -framework CoreFoundation"
                if test "$enable_framework"
                then
                        LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

diff --git a/configure.in b/configure.in
index 6937150681cf6198810a7c51079f419c1cc11f80..91f9a3bae66d104dff684ca572b59ba28194ec20 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1744,7 +1744,7 @@ then
                # slowdown in stead of a speedup, maybe due to the large number of
                # dynamic loads Python does.
 
-               LINKFORSHARED="$extra_undefs"
+               LINKFORSHARED="$extra_undefs -framework CoreFoundation"
                if test "$enable_framework"
                then
                        LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

diff --git a/setup.py b/setup.py
index ddd54526e590a1b5f744dfbc08b345f40c8c65f2..f4adfd4deeb89e9357a7f8603c14c6400b96f2e8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -424,8 +424,6 @@ class PyBuildExt(build_ext):
         exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
         # operator.add() and similar goodies
         exts.append( Extension('operator', ['operator.c']) )
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
         # C-optimized pickle replacement
         exts.append( Extension("_pickle", ["_pickle.c"]) )
         # atexit
@@ -439,22 +437,6 @@ class PyBuildExt(build_ext):
         exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
         # static Unicode character database
         exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
 
         # Modules with some UNIX dependencies -- on by default:
         # (If you have a really backward UNIX, select and socket may not be