[cig-commits] r5301 - cs/autoconf/trunk

[leif at geodynamics.org]

Author: leif
Date: 2006-11-16 04:59:42 -0800 (Thu, 16 Nov 2006)
New Revision: 5301

Modified:
   cs/autoconf/trunk/cit_python_sysconfig.m4
Log:
Fix for issue39 on Mac OS X:
"Python.framework/Versions/2.3/Python: No such file or directory"


Modified: cs/autoconf/trunk/cit_python_sysconfig.m4
===================================================================
--- cs/autoconf/trunk/cit_python_sysconfig.m4	2006-11-16 03:04:21 UTC (rev 5300)
+++ cs/autoconf/trunk/cit_python_sysconfig.m4	2006-11-16 12:59:42 UTC (rev 5301)
@@ -27,8 +27,12 @@
     # "On systems without shared libraries, LDLIBRARY is the same as LIBRARY"
     vars['BLDLIBRARY'] = "-L%(LIBPL)s -lpython%(VERSION)s" % vars
 elif vars['BLDLIBRARY']:
+    vars['BLDLIBRARY'] = "-L%(LIBDIR)s -lpython%(VERSION)s" % vars
+else:
     # "On Mac OS X frameworks, BLDLIBRARY is blank"
-    vars['BLDLIBRARY'] = "-L%(LIBDIR)s -lpython%(VERSION)s" % vars
+    # See also Issue39.
+    framework = "%(PYTHONFRAMEWORKDIR)s/Versions/%(VERSION)s/%(PYTHONFRAMEWORK)s" % vars
+    vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace(framework, "-framework " + vars.get('PYTHONFRAMEWORK', 'Python'))
 for key in keys:
     print 'PYTHON_%s="%s"' % (key, vars.get(key, ''))
 ]