Merged revisions 75281 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75281 | ronald.oussoren | 2009-10-08 10:04:15 +0200 (Thu, 08 Oct 2009) | 3 lines

  Ensure that _scproxy gets build even when --disable-toolbox-glue
  is specified on OSX. Fixes a regression in 2.6.3.
........

diff --git a/setup.py b/setup.py
index d716589fcc579f2a9459223c33b4ca934073d7be..f2540584882127449044e1883b6f3b0b52ee1e34 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1349,6 +1349,15 @@ class PyBuildExt(build_ext):
         else:
             missing.append('sunaudiodev')
 
+        if platform == 'darwin':
+            # _scproxy
+            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
+                extra_link_args= [
+                    '-framework', 'SystemConfiguration',
+                    '-framework', 'CoreFoundation'
+                ]))
+
+
         if platform == 'darwin' and ("--disable-toolbox-glue" not in
                 sysconfig.get_config_var("CONFIG_ARGS")):
 
@@ -1402,15 +1411,6 @@ class PyBuildExt(build_ext):
             addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
             addMacExtension('autoGIL', core_kwds)
 
-            # _scproxy
-            sc_kwds = {
-                'extra_compile_args': carbon_extra_compile_args,
-                'extra_link_args': [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ],
-            }
-            addMacExtension("_scproxy", sc_kwds)
 
 
             # Carbon