[bugfix] Always #include <lst.h> before using lst. Fixes build error on MinGW.

[ginac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fa8ab0e1542778400c6595d164ced5a5771a25e5..fc64c215b5cd7a38779a5d53a64ce41543edf76c 100644 (file)
--- 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], [8])
+m4_define([ginac_minor_version], [6])
+m4_define([ginac_micro_version], [2])
 m4_define([ginac_version], [ginac_major_version.ginac_minor_version.ginac_micro_version])
 m4_define([ginac_release], [ginac_major_version.ginac_minor_version])
 
@@ -24,9 +24,9 @@ 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], [2])
+m4_define([ginac_lt_current], [3])
 m4_define([ginac_lt_revision], [0])
-m4_define([ginac_lt_age], [2])
+m4_define([ginac_lt_age], [1])
 
 AC_INIT([GiNaC], ginac_version, [ginac-list@ginac.de], [ginac], [http://www.ginac.de/])
 AC_PREREQ(2.59)
@@ -61,13 +61,7 @@ AC_DEFINE_UNQUOTED(ARCHIVE_AGE, $ARCHIVE_AGE, [GiNaC archive file version age])
 
 dnl libtool versioning
 LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_age"
-dnl TODO: remove LT_RELEASE after ABI gets changed. We used to set
-dnl LT_RELEASE (for no good reason), omitting it right now would
-dnl result in a spurious SONAME change.
-LT_RELEASE="1.5"
-
 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
@@ -77,6 +71,10 @@ AM_PROG_LIBTOOL
 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++])
@@ -86,7 +84,7 @@ GINAC_STD_CXX_HEADERS
 
 dnl We need to have CLN installed.
 PKG_CHECK_MODULES(CLN, cln >= 1.2.2)
-AC_LIB_LINKFLAGS_FROM_LIBS([CLN_RPATH], [$CLN_LIBS], [1])
+AC_LIB_LINKFLAGS_FROM_LIBS([CLN_RPATH], [$CLN_LIBS])
 LIBS="$LIBS $CLN_LIBS $CLN_RPATH"
 CPPFLAGS="$CPPFLAGS $CLN_CFLAGS"
 dnl Include proper rpath into pkg-config meta data, so
@@ -103,10 +101,6 @@ dnl Check for stuff needed for building the GiNaC interactive shell (ginsh).
 AC_CHECK_HEADERS(unistd.h)
 GINAC_HAVE_RUSAGE
 GINAC_READLINE
-AC_CHECK_FILE([ginsh/ginsh_parser.h], [],
-                         [AS_IF([test -z "$YACCEXE"], [GINAC_WARNING([ginsh will not compile, because yacc/bison is missing.])])])
-AC_CHECK_FILE([ginsh/ginsh_lexer.cc], [],
-                         [AS_IF([test x"$LEX" == x":"], [GINAC_WARNING([ginsh will not compile, because lex/flex is missing.])])])
 
 dnl Check for dl library (needed for GiNaC::compile).
 GINAC_EXCOMPILER
@@ -132,12 +126,6 @@ AS_IF([test -z "$DOXYGEN"],
 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 generate boilerplate code for the (new) parser.
-dnl Only developers need this tool.
-AC_PATH_PROG(AUTOGEN, autogen, "")
-AC_CHECK_FILE([ginac/parser/builtin_fcns.cpp], [],
-                         [AS_IF([test -z "$AUTOGEN"], [GINAC_ERROR([Source will not compile, because autogen is missing.])])])
-
 dnl Output makefiles etc.
 AC_CONFIG_FILES([
 Makefile