X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=ad20b407aa10a74b51edda87bcf8c8e3a8ef7add;hp=631cbc07861dbb3498c9f4ec858b1090a9e04542;hb=bb0f99d6298fccb8cf1421fa0c7463c647f543a7;hpb=25c7a8c09f7db73b48675777aa805e788f2308be

diff --git a/configure.ac b/configure.ac
index 631cbc07..ad20b407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl GiNaC version number
 m4_define([ginac_major_version], [1])
-m4_define([ginac_minor_version], [5])
-m4_define([ginac_micro_version], [0])
+m4_define([ginac_minor_version], [6])
+m4_define([ginac_micro_version], [1])
 m4_define([ginac_version], [ginac_major_version.ginac_minor_version.ginac_micro_version])
 m4_define([ginac_release], [ginac_major_version.ginac_minor_version])
 
@@ -12,21 +12,23 @@ dnl version number. In particular, library version is OS dependent.
 dnl
 dnl When making releases, do
 dnl 1. Increment ginac_lt_revision
-dnl 2. If any interfaces have been added since the last release, increment
-dnl    ginac_lt_current and set ginac_lt_revision to 0.
-dnl 3. If any interfaces have been changed or removed since the last release,
-dnl    make sure you increment ginac_minor_version above and reset both
-dnl    ginac_lt_current and ginac_lt_revision to 0.
+dnl 2. If any interfaces have been added, removed, or changed since the last
+dnl    release, increment ginac_lt_current and set ginac_lt_revision to 0.
+dnl 3. If any interfaces have been added since the last release, increment
+dnl    ginac_lt_age.
+dnl 4. If any interfaces have been removed since the last release, set 
+dnl    ginac_lt_age to 0.
 dnl
 dnl Please note: the libtool naming scheme cannot guarantee that on all
 dnl systems, the numbering is consecutive. It only guarantees that it is
 dnl increasing. This doesn't matter, though: there is not incurred cost
 dnl for numbers that are omitted, except for shrinking the available space
 dnl of leftover numbers. Not something we need to worry about yet. ;-)
-m4_define([ginac_lt_current], [0])
-m4_define([ginac_lt_revision], [0])
+m4_define([ginac_lt_current], [2])
+m4_define([ginac_lt_revision], [1])
+m4_define([ginac_lt_age], [0])
 
-AC_INIT([GiNaC], ginac_version, [<ginac-list@ginac.de>])
+AC_INIT([GiNaC], ginac_version, [ginac-list@ginac.de], [ginac], [http://www.ginac.de/])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
 AC_CONFIG_AUX_DIR([config])
@@ -57,24 +59,22 @@ AC_SUBST(ARCHIVE_AGE)
 AC_DEFINE_UNQUOTED(ARCHIVE_VERSION, $ARCHIVE_VERSION, [Current GiNaC archive file version number])
 AC_DEFINE_UNQUOTED(ARCHIVE_AGE, $ARCHIVE_AGE, [GiNaC archive file version age])
 
-dnl libtool versioning (We don't use libtool's age numbering since we promise
-dnl to keep the binary interface compatible if only ginac_micro_version changes.
-dnl In effect, age==current.)
-LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_current"
-LT_RELEASE="ginac_release"
-
+dnl libtool versioning
+LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_age"
 AC_SUBST(LT_VERSION_INFO)
-AC_SUBST(LT_RELEASE)
-
 
 dnl Check for the compiler and all the utilities needed for the build.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
-AM_PROG_LEX
+AC_PROG_LEX
 AC_PROG_YACC
-
+AC_PATH_PROG(YACCEXE, $YACC, "")
+AS_IF([test "x$LEX" = "x:" -a ! -f $srcdir/ginsh/ginsh_lexer.cc],
+      [GINAC_WARNING([ginsh will not compile, because lex/flex is missing])])
+AS_IF([test -z "$YACCEXE" -a ! -f $srcdir/ginsh/ginsh_parser.h],
+      [GINAC_WARNING([ginsh will not compile, because yacc/bison is missing])])
 
 dnl Switch to C++ language mode for the following libraries and headers.
 AC_LANG([C++])
@@ -114,11 +114,18 @@ AM_CONDITIONAL(CONFIG_DOXYGEN, [test ! -z "$DOXYGEN"])
 AC_PATH_PROG(LATEX, latex, "")
 AC_PATH_PROG(PDFLATEX, pdflatex, "")
 AC_PATH_PROG(MAKEINDEX, makeindex, "")
+AC_PATH_PROG(MAKEINFO, makeinfo, "")
 AC_PATH_PROG(DVIPS, dvips, "")
 AM_CONDITIONAL(CONFIG_TEX, [test ! \( -z "$LATEX" -o -z $"PDFLATEX" -o -z "$MAKEINDEX" -o -z "$DVIPS" \)])
 AC_PATH_PROG(FIG2DEV, fig2dev, "")
 AM_CONDITIONAL(CONFIG_FIG2DEV, [test ! -z "$FIG2DEV"])
-
+AS_IF([test -z "$FIG2DEV" -o -z "$MAKEINFO"],
+	  [GINAC_WARNING([Documentation may not build, because fig2dev/texinfo is missing.])])
+AS_IF([test -z "$DOXYGEN"],
+	  [GINAC_WARNING([Reference manual will not build, because doxygen is missing.])])
+AS_IF([test -z "$LATEX" -o -z "$PDFLATEX" -o -z "$DVIPS"],
+	  [GINAC_WARNING([Some documentation formats may not build, because latex/pdflatex/dvips is missing.])])
+	   
 dnl Output makefiles etc.
 AC_CONFIG_FILES([
 Makefile
@@ -141,5 +148,6 @@ doc/reference/DoxyfilePDF
 doc/reference/Doxyfooter
 ])
 AC_OUTPUT
+
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS