[cig-commits] commit: Fixing a problem with the search for extra PETSc

[Mercurial]

changeset:   24:af0c54c31d8c
user:        LukeHodkinson
date:        Mon Feb 11 03:13:57 2008 +0000
files:       SConfigure
description:
Fixing a problem with the search for extra PETSc
libraries (i.e. X11).

Fixing a minor problem with OpenGL frameworks.


diff -r 6c02183c0d3b -r af0c54c31d8c SConfigure
--- a/SConfigure	Mon Feb 11 03:13:04 2008 +0000
+++ b/SConfigure	Mon Feb 11 03:13:57 2008 +0000
@@ -86,13 +86,13 @@ def petsc_get_libs(base_dir, arch, prefi
     prefix = prefix + '_LIB'
     for l in f.readlines():
         if l[:len(prefix)] == prefix:
-            libs = l.split('=')[1].strip().split(' ')
+            itms = l.split('=')[1].strip().split(' ')
             length = len(env['LIBLINKPREFIX'])
-            libs = [lib[length:] for lib in libs \
-                        if lib[:length] == env['LIBLINKPREFIX']]
+            libs = [itm[length:] for itm in itms \
+                        if itm[:length] == env['LIBLINKPREFIX']]
             length = len(env['LIBDIRPREFIX'])
-            lib_dirs = [lib[length:] for lib in libs \
-                            if lib[:length] == env['LIBDIRPREFIX']]
+            lib_dirs = [itm[length:] for itm in itms \
+                            if itm[:length] == env['LIBDIRPREFIX']]
             break
     f.close()
     return (lib_dirs, libs)
@@ -284,6 +284,7 @@ if not env.GetOption('clean'):
     ogl.hdrs = ['gl.h', 'glu.h']
     ogl.libs = [('GL', 'GLU')]
     ogl.frameworks = ['OpenGL']
+    ogl.framework_hdr_prefix = 'OpenGL'
 
     if not build_opts:
         if not cfg.CheckPackage(ogl):