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

[walter at geodynamics.org]

Author: walter
Date: 2007-09-24 10:45:28 -0700 (Mon, 24 Sep 2007)
New Revision: 8008

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/configure_vars.in
Log:
 r1923 at earth:  boo | 2007-09-24 10:16:09 -0700
 Always set RPATH, even with static libraries



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

Modified: long/3D/Gale/trunk/configure_vars.in
===================================================================
--- long/3D/Gale/trunk/configure_vars.in	2007-09-24 16:38:42 UTC (rev 8007)
+++ long/3D/Gale/trunk/configure_vars.in	2007-09-24 17:45:28 UTC (rev 8008)
@@ -48,8 +48,7 @@
 env.Append(LIBS=Split('@MPI_LIBS@'))
 for path in Split('@MPI_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-if with_shared:
-    env.Append(RPATH=Split('@MPI_LIBPATH@'))
+env.Append(RPATH=Split('@MPI_LIBPATH@'))
 mpirun='@MPIRUN@'
 
 
@@ -59,8 +58,7 @@
 env.Append(LIBS=Split('@LIBXML2_LIBS@'))
 for path in Split('@LIBXML2_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-if with_shared:
-    env.Append(RPATH=Split('@LIBXML2_LIBPATH@'))
+env.Append(RPATH=Split('@LIBXML2_LIBPATH@'))
 
 # Add in the petsc paths
 for path in Split('@PETSC_CPPPATH@'):
@@ -68,8 +66,7 @@
 env.Append(LIBS=Split('@PETSC_LIBS@'))
 for path in Split('@PETSC_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-if with_shared:
-    env.Append(RPATH=Split('@PETSC_LIBPATH@'))
+env.Append(RPATH=Split('@PETSC_LIBPATH@'))
 env.ParseConfig('echo "@PETSC_DEPS@"')
 
 # CPP and linker flags