* configure.in, cint/run_exams.cpp, cint/ginaccint.cpp: adjusted the

[ginac.git] / cint / run_exams.cpp

diff --git a/cint/run_exams.cpp b/cint/run_exams.cpp
index a23a312f50649eed7eed5a7f3f18e2c77a79fea7..add73bc94df8352dd135dae1c00802021d296136 100644 (file)
--- a/cint/run_exams.cpp
+++ b/cint/run_exams.cpp
@@ -24,8 +24,10 @@ int main(int argc, char * *argv)
        else
                setenv("LD_LIBRARY_PATH", (std::string(LD_LIBRARY_PATH)+':'+"../ginac/.libs").c_str(), 1);
        
        else
                setenv("LD_LIBRARY_PATH", (std::string(LD_LIBRARY_PATH)+':'+"../ginac/.libs").c_str(), 1);
        

-       // hard-wire CINTSYSDIR, inherited from configure
-       setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 1);
+       // hard-wire CINTSYSDIR, inherited from configure, but only if it has
+       // been set therein (to allow for system-wide installations of cint).
+       if (CINTSYSDIR != "@CINTSYSDIR@")
+               setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 1);

        
        // execute the real thing
        int error = execve(binprog.c_str(), argv, environ);
        
        // execute the real thing
        int error = execve(binprog.c_str(), argv, environ);