[cig-commits] r8083 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2007-10-05 12:14:26 -0700 (Fri, 05 Oct 2007)
New Revision: 8083

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/configure_vars.in
Log:
 r1952 at earth:  boo | 2007-10-05 12:05:03 -0700
 Modify configure_vars to be compatible with scons 0.97



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

Modified: long/3D/Gale/trunk/configure_vars.in
===================================================================
--- long/3D/Gale/trunk/configure_vars.in	2007-10-05 19:14:22 UTC (rev 8082)
+++ long/3D/Gale/trunk/configure_vars.in	2007-10-05 19:14:26 UTC (rev 8083)
@@ -44,7 +44,10 @@
 
 # Add in the MPI paths
 for path in Split('@MPI_CPPPATH@'):
-    env.Append(CPPPATH=['#/'+path])
+    if(path[0]=='/'):
+        env.Append(CPPPATH=[path])
+    else:
+        env.Append(CPPPATH=['#/'+path])
 env.Append(LIBS=Split('@MPI_LIBS@'))
 for path in Split('@MPI_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
@@ -54,7 +57,10 @@
 
 # Add in the libxml2 paths
 for path in Split('@LIBXML2_CPPPATH@'):
-    env.Append(CPPPATH=['#/'+path])
+    if(path[0]=='/'):
+        env.Append(CPPPATH=[path])
+    else:
+        env.Append(CPPPATH=['#/'+path])
 env.Append(LIBS=Split('@LIBXML2_LIBS@'))
 for path in Split('@LIBXML2_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
@@ -62,7 +68,10 @@
 
 # Add in the petsc paths
 for path in Split('@PETSC_CPPPATH@'):
-    env.Append(CPPPATH=['#/'+path])
+    if(path[0]=='/'):
+        env.Append(CPPPATH=[path])
+    else:
+        env.Append(CPPPATH=['#/'+path])
 env.Append(LIBS=Split('@PETSC_LIBS@'))
 for path in Split('@PETSC_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])