r2797 - /1.2/sconstruct -- November 10, 2006 - 07:30

Author: bugman
Date: Fri Nov 10 07:30:21 2006
New Revision: 2797

URL: http://svn.gna.org/viewcvs/relax?rev=2797&view=rev
Log:
Ported r2790 and r2791 from the 1.3 line.

The command used was:
svn merge -r2789:2791 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

These changes enable relax's C modules to be compiled using gcc on Mac OS X.


Modified:
    1.2/sconstruct

Modified: 1.2/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sconstruct?rev=2797&r1=2796&r2=2797&view=diff
==============================================================================
--- 1.2/sconstruct (original)
+++ 1.2/sconstruct Fri Nov 10 07:30:21 2006
@@ -35,6 +35,7 @@
 from scons.distrib import package, gpg_sign
 from scons.install import install, uninstall
 from scons.manuals import clean_manual_files, compile_api_manual_html, 
compile_user_manual_html, compile_user_manual_pdf, fetch_docstrings, 
version_file
+import SCons.Util
 
 # relax version file.
 from version import version
@@ -481,9 +482,11 @@
         # Add the python library path to the environment.
         env.Append(LIBPATH = libpath)
 
-        # Catch Mac OS X and send the correct command line options to the 
linker.
+        # Catch Mac OS X and send the correct command line options to the 
linker (these may become redundant as SCons improves).
         if env['PLATFORM'] == 'darwin':
             env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix 
+ path.sep + 'bin' + path.sep + 'python', '-dynamic'])
+            env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
+            env['SHLIBSUFFIX'] = '.so'
 
         # Loop over the relaxation curve fitting files.
         nodes = []