X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=945d2f59bb36d3d9755ea602a1102678616bed96;hp=3bf349f600963fbafdf9180e27ac3cc7687c5351;hb=5061cef31b58e90ff57c579d077c9ce625688161;hpb=9e2c1a0044ff991627ae22070727a33e12d79954

diff --git a/configure.in b/configure.in
index 3bf349f6..945d2f59 100644
--- a/configure.in
+++ b/configure.in
@@ -18,8 +18,8 @@ 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=7
-GINACLIB_MICRO_VERSION=0
+GINACLIB_MINOR_VERSION=9
+GINACLIB_MICRO_VERSION=1
 GINACLIB_INTERFACE_AGE=0
 GINACLIB_BINARY_AGE=0
 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_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
@@ -111,9 +113,9 @@ AC_CHECK_HEADERS(sstream strstream)
 dnl We need to have Bruno Haible's CLN installed.
 dnl (CLN versions >= 1.1.0 must have installed cln.m4 at a visible place,
 dnl which provides this macro):
-AC_PATH_LIBCLN(1.1.0, [
-  LIBS="$LIBS $LIBCLN_LIBS"
-  CPPFLAGS="$CPPFLAGS $LIBCLN_CPPFLAGS"
+AC_PATH_CLN(1.1.0, [
+  LIBS="$LIBS $CLN_LIBS"
+  CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 ], GINAC_ERROR([No suitable installed version of CLN could be found.]))
 
 dnl Expand the cppflags and libraries needed by apps using GiNaC
@@ -149,38 +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)
-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
-    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 -M0x10; \
-    cd ..)
-    GINACCINTDIR="cint"
-  else
-    AC_MSG_ERROR([Cannot configure GiNaC-cint])
-  fi
-fi
-AC_SUBST(CINTSYSDIR)
-AC_SUBST(GINACCINTDIR)
-
 dnl Output makefiles etc.
 AC_OUTPUT([
 Makefile
@@ -197,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