]> git.cworth.org Git - fips/commitdiff
Respect GLAZE_LIBGL environment variable (if FIPS_LIBGL is unset)
authorCarl Worth <cworth@cworth.org>
Tue, 22 Oct 2013 19:19:37 +0000 (12:19 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 22 Oct 2013 20:00:48 +0000 (13:00 -0700)
Since the LD_PRELOAD mechanism of fips may not work with some
programs, users may want to run fips within glaze instead, (which uses
LD_LIBRARY_PATH instead of LD_PRELOAD). In order to make this
convenient, fips can recognize that glaze has identified the
appropriate libGL.so library by examining the GLAZE_LIBGL environment
variable.

So, if the user has not specifically set the FIPS_LIBGL variable, and
the GLAZE_LIBGL variable is set, use it to find the libGL.so to load.

glwrap.c

index f5b4f84340f249bae9cb8beb152110a688c9aaec..aa560386feca11db8abbf18a3a5412f14be5fbe3 100644 (file)
--- a/glwrap.c
+++ b/glwrap.c
@@ -97,6 +97,8 @@ glwrap_lookup (char *name)
                const char *path;
 
                path = getenv ("FIPS_LIBGL");
+               if (! path)
+                       path = getenv ("GLAZE_LIBGL");
                if (path) {
                        gl_handle = dlopen (path, RTLD_LAZY);