X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=0f40373e1acd715fdc8ef0dec884f2dc041b613f;hp=c90f09d64010f29c3f6a61b71047a1aed9164bfa;hb=71118ab007969a09872193641469318c9dc4fbcc;hpb=b8150271ff497c2ef0c2a8748f5f53b4f1bab7c8 diff --git a/configure.ac b/configure.ac index c90f09d6..0f40373e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,40 +1,44 @@ dnl Process this file with autoconf to produce a configure script. -dnl GiNaC library version information. -dnl -dnl Making releases: -dnl ginac_micro_version += 1; -dnl ginac_interface_age += 1; -dnl ginac_binary_age += 1; -dnl if any functions have been added, set ginac_interface_age to 0. -dnl if backwards compatibility has been broken, -dnl set ginac_binary_age and ginac_interface_age to 0. - +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_micro_version], [5]) m4_define([ginac_version], [ginac_major_version.ginac_minor_version.ginac_micro_version]) m4_define([ginac_release], [ginac_major_version.ginac_minor_version]) -m4_define([ginac_interface_age], [0]) -m4_define([ginac_binary_age], [0]) + +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 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 +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], [1]) +m4_define([ginac_lt_revision], [0]) AC_INIT([GiNaC], ginac_version, []) 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 @@ -53,11 +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 -m4_define([lt_revision], [ginac_interface_age]) -m4_define([lt_current], [m4_eval(ginac_micro_version - ginac_interface_age)]) -m4_define([lt_age], [m4_eval(ginac_binary_age - ginac_interface_age)]) -LT_VERSION_INFO="lt_current:lt_revision: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) @@ -79,13 +82,16 @@ 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) -LIBS="$LIBS $CLN_LIBS" +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" +dnl Include proper rpath into pkg-config meta data, so +dnl g++ `pkg-config --cflags --libs ginac` +dnl actually works +GINACLIB_LIBS='-L${libdir} -lginac' +AC_LIB_LINKFLAGS_FROM_LIBS([GINACLIB_RPATH], [$GINACLIB_LIBS]) dnl Check for data types which are needed by the hash function dnl (golden_ratio_hash). @@ -98,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 @@ -122,7 +129,6 @@ Makefile GiNaC.spec ginac.pc ginac/Makefile -ginac/version.h check/Makefile ginsh/Makefile ginsh/ginsh.1