[cig-commits] r4203 - in long/3D/Gale/trunk: . python/Gale/packages

[walter at geodynamics.org]

Author: walter
Date: 2006-08-02 14:48:28 -0700 (Wed, 02 Aug 2006)
New Revision: 4203

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/Gale/packages/petsc.py
Log:
 r569 at earth:  boo | 2006-08-02 12:12:57 -0700
 Checks first whether X11_INCLUDE exists at all



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:566
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:569

Modified: long/3D/Gale/trunk/python/Gale/packages/petsc.py
===================================================================
--- long/3D/Gale/trunk/python/Gale/packages/petsc.py	2006-08-02 19:42:02 UTC (rev 4202)
+++ long/3D/Gale/trunk/python/Gale/packages/petsc.py	2006-08-02 21:48:28 UTC (rev 4203)
@@ -78,9 +78,10 @@
           vars={}
           parse_makefile(bmakeDir + '/petscconf', vars)
           packages_libs=expand_makefile_vars(str(vars['PACKAGES_LIBS']), vars)
-          packages_includes= \
-            expand_makefile_vars(str(vars['X11_INCLUDE']),vars) + ' ' \
-            + expand_makefile_vars(str(vars['MPI_INCLUDE']),vars) + ' ' \
+          if vars.has_key('X11_INCLUDE'):
+            packages_includes=expand_makefile_vars(str(vars['X11_INCLUDE']),vars) + ' '
+          packages_includes+= \
+            expand_makefile_vars(str(vars['MPI_INCLUDE']),vars) + ' ' \
             + expand_makefile_vars(str(vars['BLASLAPACK_INCLUDE']),vars)
           self.compilers.LIBS += ' ' + packages_libs
       elif config.setCompilers.Configure.isDarwin():