X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=6e4a4119d97cfadc8c7f59f09663d2e866b5bce5;hp=edee0de838a5337c2ef7300b0b62287c2bb258ca;hb=ff4d880932862000fce73efc3fb6da49c8d63ed6;hpb=eded9cd9d5df793c1ea5a1f766eff261ded46bde

diff --git a/configure.ac b/configure.ac
index edee0de8..6e4a4119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,15 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl GiNaC version number
+dnl Pull version info from the ginac/version.h file.
+dnl GiNaC release number:
 m4_define([ginac_major_version], GINAC_GET_VERSION([MAJOR]))
 m4_define([ginac_minor_version], GINAC_GET_VERSION([MINOR]))
 m4_define([ginac_micro_version], GINAC_GET_VERSION([MICRO]))
 m4_define([ginac_version], [ginac_major_version.ginac_minor_version.ginac_micro_version])
 m4_define([ginac_release], [ginac_major_version.ginac_minor_version])
-
 dnl GiNaC library version information. It has very little to do with GiNaC
 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, 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], [3])
-m4_define([ginac_lt_revision], [0])
-m4_define([ginac_lt_age], [1])
+m4_define([ginac_lt_current], GINAC_GET_LTVERSION([CURRENT]))
+m4_define([ginac_lt_age], GINAC_GET_LTVERSION([AGE]))
+m4_define([ginac_lt_revision], GINAC_GET_LTVERSION([REVISION]))
 
 AC_INIT([GiNaC], ginac_version, [ginac-list@ginac.de], [ginac], [http://www.ginac.de/])
 AC_PREREQ(2.59)
@@ -35,7 +18,7 @@ AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 dnl This defines PACKAGE and VERSION.
-AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
+AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2 subdir-objects])
 
 dnl libtool versioning
 LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_age"
@@ -49,13 +32,14 @@ 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],
+AS_IF([test "x$LEX" = "x:" -a ! -f $srcdir/ginsh/ginsh_lexer.cpp],
       [GINAC_WARNING([ginsh will not compile, because lex/flex is missing])])
-AS_IF([test -z "$YACCEXE" -a ! -f $srcdir/ginsh/ginsh_parser.h],
+AS_IF([test -z "$YACCEXE" -a ! -f $srcdir/ginsh/ginsh_parser.hpp],
       [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++])
+AX_CXX_COMPILE_STDCXX_11
 
 dnl Make sure all the necessary standard headers are installed on the system.
 GINAC_STD_CXX_HEADERS