Fixed the fix in commit f059ebe117d15292e0d262e6e8e232e835c7e33c.

[ginac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 78d7f2a6785d20f54e27ae7edb0329cda5fce074..9fe9d5f3875634ebd49ebf3aab7ab011b046ddf2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,10 +12,11 @@ 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 removed since the last release, set 
-dnl    ginac_lt_age to 0.
+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
 dnl Please note: the libtool naming scheme cannot guarantee that on all
 dnl systems, the numbering is consecutive. It only guarantees that it is
@@ -23,27 +24,21 @@ 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_age], [0])
 m4_define([ginac_lt_revision], [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])
-AC_CONFIG_HEADERS([config/config.h])
+AC_CONFIG_HEADERS([config/config.h ginac/version.h])
 AC_CONFIG_MACRO_DIR([m4])
 dnl This defines PACKAGE and VERSION.
-AM_INIT_AUTOMAKE([gnu 1.7 dist-bzip2])
+AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
 
 dnl Process GiNaC version information
-GINACLIB_MAJOR_VERSION=ginac_major_version
-GINACLIB_MINOR_VERSION=ginac_minor_version
-GINACLIB_MICRO_VERSION=ginac_micro_version
-GINACLIB_VERSION=ginac_version
-AC_SUBST(GINACLIB_MAJOR_VERSION)
-AC_SUBST(GINACLIB_MINOR_VERSION)
-AC_SUBST(GINACLIB_MICRO_VERSION)
-AC_SUBST(GINACLIB_VERSION)
+AC_DEFINE([GINACLIB_MAJOR_VERSION], ginac_major_version, [Major version of GiNaC])
+AC_DEFINE([GINACLIB_MINOR_VERSION], ginac_minor_version, [Minor version of GiNaC])
+AC_DEFINE([GINACLIB_MICRO_VERSION], ginac_micro_version, [Micro version of GiNaC])
 
 dnl GiNaC archive file version information.
 dnl
@@ -62,8 +57,10 @@ 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
-LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_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"
 
 AC_SUBST(LT_VERSION_INFO)
@@ -85,11 +82,8 @@ AC_LANG([C++])
 dnl Make sure all the necessary standard headers are installed on the system.
 GINAC_STD_CXX_HEADERS
 
-dnl We need to have Bruno Haible's CLN installed.
-dnl (pkg-config must have installed pkg.m4 at a visible place, which provides
-dnl this macro. CLN >= 1.1.6 must have installed cln.pc at a visible place,
-dnl which provides the actual dependency information.)
-PKG_CHECK_MODULES(CLN, cln >= 1.1.6)
+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])
 LIBS="$LIBS $CLN_LIBS $CLN_RPATH"
 CPPFLAGS="$CPPFLAGS $CLN_CFLAGS"
@@ -110,6 +104,7 @@ GINAC_READLINE
 
 dnl Check for dl library (needed for GiNaC::compile).
 GINAC_EXCOMPILER
+AM_CONDITIONAL(CONFIG_EXCOMPILER, [test "x${CONFIG_EXCOMPILER}" = "xyes"])
 
 dnl Check for utilities needed by the different kinds of documentation.
 dnl Documentation needs only be built when extending it, so never mind if it
@@ -134,7 +129,6 @@ Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile
-ginac/version.h
 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1