X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=a932568ea99ff45f8b08ec14a5e819dbf476462b;hp=fc64c215b5cd7a38779a5d53a64ce41543edf76c;hb=7d2c44606a17c76f6bec520c22eba96fa5875961;hpb=4077d8b144e2e5f3db75cf95fbb590981b2eb8d4

diff --git a/configure.ac b/configure.ac
index fc64c215..a932568e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,63 +1,24 @@
-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], [6])
-m4_define([ginac_micro_version], [2])
+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)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_HEADERS([config/config.h ginac/version.h])
+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])
-
-dnl Process GiNaC version information
-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
-dnl If properties have been added, ARCHIVE_VERSION += 1, ARCHIVE_AGE += 1.
-dnl If backwards compatibility has been broken, set ARCHIVE_AGE to 0.
-dnl
-dnl The version number in newly created archives will be ARCHIVE_VERSION.
-dnl Archives version (ARCHIVE_VERSION-ARCHIVE_AGE) thru ARCHIVE_VERSION can
-dnl be read by this version of the GiNaC library.
-
-ARCHIVE_VERSION=3
-ARCHIVE_AGE=3
-
-AC_SUBST(ARCHIVE_VERSION)
-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])
+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"
@@ -71,9 +32,9 @@ 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.
@@ -101,6 +62,10 @@ dnl Check for stuff needed for building the GiNaC interactive shell (ginsh).
 AC_CHECK_HEADERS(unistd.h)
 GINAC_HAVE_RUSAGE
 GINAC_READLINE
+dnl Python is necessary for building function.{cpp,h}
+AC_PATH_PROG(PYTHON, python, "")
+AS_IF([test -z "$PYTHON" -a ! -f "$srcdir/ginac/function.cpp"],
+      [AC_MSG_ERROR([GiNaC will not compile because Python is missing])])
 
 dnl Check for dl library (needed for GiNaC::compile).
 GINAC_EXCOMPILER