r23759 - in /branches/disp_spin_speed: ./ sconstruct -- June 09, 2014 - 19:50

Author: tlinnet
Date: Mon Jun  9 19:50:27 2014
New Revision: 23759

URL: http://svn.gna.org/viewcvs/relax?rev=23759&view=rev
Log:
Merged revisions 23753 via svnmerge from 
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk

........
  r23753 | tlinnet | 2014-06-09 19:23:21 +0200 (Mon, 09 Jun 2014) | 7 lines
  
  Added searching for enviroment variable PYTHON_INCLUDE_DIR if Python.h is 
not found in
  standard python library.
  
  This can be very handsome, if one has a python virtual enviroment for 
multiple users.
  
  This relates to the wiki page:
  http://wiki.nmr-relax.com/Epd_canopy
........

Modified:
    branches/disp_spin_speed/   (props changed)
    branches/disp_spin_speed/sconstruct

Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  9 19:50:27 2014
@@ -1 +1 @@
-/trunk:1-23743
+/trunk:1-23758

Modified: branches/disp_spin_speed/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/sconstruct?rev=23759&r1=23758&r2=23759&view=diff
==============================================================================
--- branches/disp_spin_speed/sconstruct (original)
+++ branches/disp_spin_speed/sconstruct Mon Jun  9 19:50:27 2014
@@ -572,6 +572,18 @@
         py_include_minpath = sys.prefix + path.sep + 'include'
         py_include_fullpath = py_include_minpath + path.sep + 'python' + 
`sys.version_info[0]` + '.' + `sys.version_info[1]`
 
+        # Test if Python.h resides here.
+        f_name_pyth = py_include_minpath + path.sep + 'Python.h'
+        if not access(f_name_pyth, F_OK):
+
+            # Test if 'PYTHON_INCLUDE_DIR' has been set to system 
environment.
+            if 'PYTHON_INCLUDE_DIR' in environ:
+
+                # Test if Python.h is here.
+                f_name_pyth = environ['PYTHON_INCLUDE_DIR'] + path.sep + 
'Python.h'
+                if access(f_name_pyth, F_OK):
+                    py_include_fullpath = environ['PYTHON_INCLUDE_DIR']
+
         # Construct the python bin path.
         py_bin_minpath = sys.prefix + path.sep + 'bin'
         py_bin_fullpath = py_bin_minpath + path.sep + 'python' + 
`sys.version_info[0]` + '.' + `sys.version_info[1]`