X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=7e0f9b2f4054ec1fd208f13ce045b22ca411b911;hp=78954ecacce78dd0f36c327594e1044991c88b28;hb=ee1ec9db30b446d2d6348df2ce758ed2ff62a310;hpb=a32a30d8ccdd0eb945b8180c8fe82d154e9280de

diff --git a/configure.ac b/configure.ac
index 78954eca..7e0f9b2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,39 +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_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, 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
+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_age], [0])
+m4_define([ginac_lt_revision], [0])
 
 AC_INIT([GiNaC], ginac_version, [<ginac-list@ginac.de>])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_AUX_DIR([config])
+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,10 +58,7 @@ AC_DEFINE_UNQUOTED(ARCHIVE_VERSION, $ARCHIVE_VERSION, [Current GiNaC archive fil
 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"
+LT_VERSION_INFO="ginac_lt_current:ginac_lt_revision:ginac_lt_age"
 LT_RELEASE="ginac_release"
 
 AC_SUBST(LT_VERSION_INFO)
@@ -83,8 +85,14 @@ 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"
+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).
@@ -121,7 +129,6 @@ Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile
-ginac/version.h
 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1