X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=77fdcbef7ec97aaac9a5c2440cea0ded98ce17a6;hp=4e34b5c8c79d79f1793086c609308730456ad11c;hb=4db916435e7ec0bb4dfaee337e2149f954be0690;hpb=c8f803635681fe6193cdf8f49bdf4073e0eeb8da

diff --git a/configure.in b/configure.in
index 4e34b5c8..77fdcbef 100644
--- a/configure.in
+++ b/configure.in
@@ -18,10 +18,10 @@ dnl autoconf sees "AC_MAJOR_VERSION" and complains about an undefined macro
 dnl (don't we all *love* M4?)...
 
 GINACLIB_MAJOR_VERSION=0
-GINACLIB_MINOR_VERSION=8
-GINACLIB_MICRO_VERSION=1
-GINACLIB_INTERFACE_AGE=0
-GINACLIB_BINARY_AGE=0
+GINACLIB_MINOR_VERSION=9
+GINACLIB_MICRO_VERSION=2
+GINACLIB_INTERFACE_AGE=1
+GINACLIB_BINARY_AGE=1
 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION
 
 AC_SUBST(GINACLIB_MAJOR_VERSION)
@@ -34,14 +34,14 @@ AC_SUBST(GINACLIB_VERSION)
 dnl GiNaC archive file version information.
 dnl
 dnl If properties have been added, ARCHIVE_VERSION += 1, ARCHIVE_AGE += 1.
-dnl If backwards compatibility has been broken, ARCHIVE_AGE to 0.
+dnl If backwards compatibility has been broken, set ARCHIVE_AGE to 0.
 dnl
 dnl The version number in newly created archives will be ARCHIVE_VERSION.
 dnl Archives version (ARCHIVE_VERSION-ARCHIVE_AGE) thru ARCHIVE_VERSION can
 dnl be read by this version of the GiNaC library.
 
-ARCHIVE_VERSION=0
-ARCHIVE_AGE=0
+ARCHIVE_VERSION=1
+ARCHIVE_AGE=1
 
 AC_SUBST(ARCHIVE_VERSION)
 AC_SUBST(ARCHIVE_AGE)
@@ -94,7 +94,9 @@ GINAC_TERMCAP
 save_LIBS=$LIBS
 LIBS="$LIBTERMCAP $LIBS"
 AC_CHECK_LIB(readline, readline)
-if test "x${ac_cv_lib_readline_readline}" != "xyes"; then
+if test "x${ac_cv_lib_readline_readline}" = "xyes"; then
+  GINAC_LIB_READLINE_VERSION
+else
   GINAC_WARNING([I could not find libreadline (needed by ginsh).])
 fi
 GINSH_LIBS=$LIBS
@@ -149,60 +151,6 @@ fi
 AC_SUBST(TUTORIAL_TARGETS)
 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
-  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
-  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
-    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(GINACCINTDIR)
-
 dnl Output makefiles etc.
 AC_OUTPUT([
 Makefile
@@ -219,8 +167,6 @@ tools/viewgar.1
 doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
-cint/Makefile
-cint/launch.h
 ], [chmod +x ginac-config])
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS