[cig-commits] commit:

[Mercurial]

changeset:   24:91b50340d74f
user:        LukeHodkinson
date:        Wed Jan 30 06:59:54 2008 +0000
files:       SConfigure
description:
Same as for StGermain (updating RPATH).


diff -r 3214225f7c72 -r 91b50340d74f SConfigure
--- a/SConfigure	Wed Jan 30 06:49:05 2008 +0000
+++ b/SConfigure	Wed Jan 30 06:59:54 2008 +0000
@@ -52,7 +52,7 @@ def CheckPackage(ctx, name, check, state
         old = push_paths(state[0], state[1])
         for libs in lib_gen():
             libs = [libs] if isinstance(libs, str) else libs
-            res = check(ctx, libs)
+            res = check(ctx, libs, state[1])
             if res:
                 env['PACKAGES'][name] = (state, libs)
                 ctx.Result(res)
@@ -76,7 +76,7 @@ def CheckPackage(ctx, name, check, state
         old = push_paths(state[0], state[1])
         for libs in lib_gen():
             libs = [libs] if isinstance(libs, str) else libs
-            res = check(ctx, libs)
+            res = check(ctx, libs, state[1])
             if res:
                 env['PACKAGES'][name] = (state, libs)
                 ctx.Result(res)
@@ -90,7 +90,7 @@ def CheckPackage(ctx, name, check, state
         old = push_paths(state[0], state[1])
         for libs in lib_gen():
             libs = [libs] if isinstance(libs, str) else libs
-            res = check(ctx, libs)
+            res = check(ctx, libs, state[1])
             if res:
                 env['PACKAGES'][name] = (state, libs)
                 ctx.Result(res)
@@ -174,7 +174,7 @@ def mpich_lib_gen():
     yield ['pmpich', 'rt']
     yield ['mpich', 'pmpich', 'rt']
 
-def check_mpich(ctx, libs):
+def check_mpich(ctx, libs, libpath=None):
     src = """
 #include<mpi.h>
 int main(int argc, char** argv) {
@@ -183,10 +183,12 @@ return (MPI_VERSION == 2) ? 0 : 1;
 return (MPI_VERSION == 2) ? 0 : 1;
 }
 """
-    old = env['LIBS']
+    old = env['LIBS'], env['RPATH']
     env.Replace(LIBS=libs)
+    env.Replace(RPATH=libpath)
     res = ctx.TryRun(src, '.c')[0]
-    env.Replace(LIBS=old)
+    env.Replace(LIBS=old[0])
+    env.Replace(RPATH=old[1])
     if not res:
         return res
 
@@ -218,7 +220,7 @@ def libxml2_lib_gen():
 def libxml2_lib_gen():
     yield ['libxml2']
 
-def check_libxml2(ctx, libs):
+def check_libxml2(ctx, libs, libpath=None):
     src = """
 #include<libxml/xmlIO.h>
 int main(int argc, char** argv) {
@@ -258,7 +260,7 @@ def stgermain_lib_gen():
 def stgermain_lib_gen():
     yield ['StGermain']
 
-def check_stgermain(ctx, libs):
+def check_stgermain(ctx, libs, libpath=None):
     src = """
 #include<StGermain/StGermain.h>
 int main(int argc, char** argv) {