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

  --with-cint logic so ginaccint may run without a preset $CINTSYSDIR
  (in case of a clean system-wide installation as opposed to the tool-
  centric installation).  cint/Makefile.makecint generation does not
  yet work in this case, makecint needs a tiny upstream bugfix.

diff --git a/cint/ginaccint.cpp b/cint/ginaccint.cpp
index 515835c14c02f57002a0747963dbc564abd038f5..cd875e90879a58004a855e9427274b5cd4fbe4a4 100644 (file)
--- a/cint/ginaccint.cpp
+++ b/cint/ginaccint.cpp
@@ -31,8 +31,11 @@ int main(int argc, char * *argv)
        else
                setenv("LD_LIBRARY_PATH", (std::string(LD_LIBRARY_PATH)+':'+libdir).c_str(), 1);
        
-       // hard-wire CINTSYSDIR, inherited from configure, if it is not set
-       setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 0);
+       // hard-wire CINTSYSDIR, inherited from configure, but only if it has
+       // been set therein (to allow for system-wide installations of cint)
+       // and without overriding it if the user has specified it.
+       if (CINTSYSDIR != "@CINTSYSDIR@")
+               setenv("CINTSYSDIR", CINTSYSDIR.c_str(), 0);
        
        // execute the real thing
        int error = execve(binprog.c_str(), argv, environ);

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);
        
-       // 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);