From c9282804ff4127fc84bb01b2b8707fbb6724b003 Mon Sep 17 00:00:00 2001
From: Richard Kreckel <Richard.Kreckel@uni-mainz.de>
Date: Thu, 22 Mar 2001 20:09:22 +0000
Subject: [PATCH] * INSTALL: reflect Cint status. * 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.

---
 INSTALL      |  4 +---
 configure.in | 62 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4aaa386b..fadf8bae 100644
--- a/INSTALL
+++ b/INSTALL
@@ -111,6 +111,4 @@ to compile, install and work properly:
 --------------+----------------------------------------------------------
  < 5.14.39    | `VERBOTEN' by license (please bite your favorite lawyer)
  < 5.14.60    | since GiNaC version 0.7, these do not compile any more
-   5.14.62-72 | compiles fine, works well with GCC 2.95.x.  GCC3 no go.
-   5.14.74    | requires defining -DG__LONGBUF in SYSMACRO and OTHMACRO.
-   5.14.75-78 | compiles fine, works well with GCC 2.95.x.  GCC3 no go.
+   5.14.62-79 | compiles fine, works well with GCC 2.95.x.  GCC3 no go.
diff --git a/configure.in b/configure.in
index 111d7b2d..43a0006b 100644
--- a/configure.in
+++ b/configure.in
@@ -151,34 +151,56 @@ AC_SUBST(REFERENCE_TARGETS)
 
 dnl Configure GiNaC-cint
 AC_ARG_WITH(cint, [  --with-cint=CINTSYSDIR  build GiNaC-cint C++ interpreter [default=no]], , with_cint=no)
+dnl The variable GINACCINTDIR controls whether the subdirectory cint is entered
+dnl from the top-level Makefile or not.
 GINACCINTDIR=
 if test "x$with_cint" != "xno"; then
-  if test "x$with_cint" = "xyes"; then
-    if test "x$CINTSYSDIR" = "x"; then
-      AC_MSG_ERROR([please export \$CINTSYSDIR or specify --with-cint=CINTSYSDIR])
-    fi
-  else
+  dnl Maybe CINTSYSDIR was passed as an argument.  In this case it should 
+  dnl override any CINTSYSDIR variable already set.
+  if test "x$with_cint" != "xyes"; then
     CINTSYSDIR=$with_cint
     export CINTSYSDIR
   fi
-  AC_PATH_PROG(CINT, cint, "", $CINTSYSDIR:$PATH)
-  AC_PATH_PROG(MAKECINT, makecint, "", $CINTSYSDIR:$PATH)
-  if [[ "$CINT" -a "$MAKECINT" ]]; then
-    AC_MSG_RESULT([creating cint/Makefile])
-    (cd cint && \
-    $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
-      -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
-      -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \
-      -C++ ginaccint.bin.cpp \
-      -l -L../ginac/.libs -lginac -lcln \
-      -cint -M0x110; \
-    cd ..)
-    GINACCINTDIR="cint"
+  dnl Now have to handle two possbile cases, one with CINTSYSDIR set and one 
+  dnl without.  In the first one we search for cint and makecint in CINTSYSDIR
+  dnl and PATH, in the second there is only the PATH to search in.
+  if test "x$CINTSYSDIR" != "x"; then
+    AC_PATH_PROG(CINT, cint, , $CINTSYSDIR:$PATH)
+    AC_PATH_PROG(MAKECINT, makecint, , $CINTSYSDIR:$PATH)
+    if [[ "$CINT" -a "$MAKECINT" ]]; then
+      AC_MSG_RESULT([creating cint/Makefile])
+      (cd cint && \
+      $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
+        -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
+        -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \
+        -C++ ginaccint.bin.cpp \
+        -l -L../ginac/.libs -lginac -lcln \
+        -cint -M0x110; \
+      cd ..)
+      GINACCINTDIR="cint"
+      AC_SUBST(CINTSYSDIR)
+    else
+      GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
+    fi
   else
-    GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
+    AC_PATH_PROG(CINT, cint)
+    AC_PATH_PROG(MAKECINT, makecint)
+    if [[ "$CINT" -a "$MAKECINT" ]]; then
+      AC_MSG_RESULT([creating cint/Makefile])
+      (cd cint && \
+      $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
+        -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
+        -I .. -m -H ../ginac/ginac.h \
+        -C++ ginaccint.bin.cpp \
+        -l -L../ginac/.libs -lginac -lcln \
+        -cint -M0x110; \
+      cd ..)
+      GINACCINTDIR="cint"
+    else
+      GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
+    fi
   fi
 fi
-AC_SUBST(CINTSYSDIR)
 AC_SUBST(GINACCINTDIR)
 
 dnl Output makefiles etc.
-- 
2.44.0