Allow underscores in identifiers.

[ginac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e4a1e60ab59f5a51567fd2efc3aa9f2e21d9ac5c..b2a8e84e2ec3a97411c5c1985923dc4da6f32b38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,39 +1,46 @@
 dnl Process this file with autoconf to produce a configure script.
 
 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_major_version], [1])
 m4_define([ginac_minor_version], [5])

-m4_define([ginac_micro_version], [0])
+m4_define([ginac_micro_version], [2])

 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_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 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], [0])
+m4_define([ginac_lt_age], [0])
+m4_define([ginac_lt_revision], [2])

 
 AC_INIT([GiNaC], ginac_version, [<ginac-list@ginac.de>])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
 
 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.
 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
 
 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
 
 dnl GiNaC archive file version information.
 dnl


@@ -53,10 +60,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
 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)
 LT_RELEASE="ginac_release"
 
 AC_SUBST(LT_VERSION_INFO)


@@ -71,70 +75,38 @@ AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
 AM_PROG_LEX
 AC_PROG_YACC
 

-dnl Check for data types which are needed by the hash function 
-dnl (golden_ratio_hash).
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(long double)
-AC_CHECK_SIZEOF(void *)

 
 dnl Switch to C++ language mode for the following libraries and headers.
 AC_LANG([C++])
 
 
 dnl Switch to C++ language mode for the following libraries and headers.
 AC_LANG([C++])
 

-dnl Check for stuff needed for building the GiNaC interactive shell (ginsh).
-AC_CHECK_HEADERS(unistd.h)
-GINAC_HAVE_RUSAGE
-AC_CHECK_HEADERS(readline/readline.h readline/history.h)
-if test "x${ac_cv_header_readline_readline_h}" != "xyes" -o "x${ac_cv_header_readline_history_h}" != "xyes"; then
-  GINAC_WARNING([I could not find the headers for libreadline (needed for building ginsh).])
-fi
-GINAC_TERMCAP
-save_LIBS=$LIBS
-LIBS="$LIBTERMCAP $LIBS"
-AC_CHECK_LIB(readline, readline)
-if test "x${ac_cv_lib_readline_readline}" = "xyes"; then
-  GINAC_LIB_READLINE_VERSION
-else
-  GINAC_WARNING([I could not find libreadline (needed by ginsh).])
-fi
-GINSH_LIBS=$LIBS
-LIBS=$save_LIBS
-AC_SUBST(GINSH_LIBS)
-

 dnl Make sure all the necessary standard headers are installed on the system.
 dnl Make sure all the necessary standard headers are installed on the system.

-AC_CHECK_HEADER(iosfwd, , GINAC_ERROR([The standard <iosfwd> header file could not be found.]))
-AC_CHECK_HEADER(iostream, , GINAC_ERROR([The standard <iostream> header file could not be found.]))
-AC_CHECK_HEADER(vector, , GINAC_ERROR([The standard <vector> header file could not be found.]))
-AC_CHECK_HEADER(list, , GINAC_ERROR([The standard <list> header file could not be found.]))
-AC_CHECK_HEADER(map, , GINAC_ERROR([The standard <map> header file could not be found.]))
-AC_CHECK_HEADER(string, , GINAC_ERROR([The standard <string> header file could not be found.]))
-AC_CHECK_HEADER(sstream, , GINAC_ERROR([The standard <sstream> header file could not be found.]))
-AC_CHECK_HEADER(typeinfo, , GINAC_ERROR([The standard <typeinfo> header file could not be found.]))
-AC_CHECK_HEADER(stdexcept, , GINAC_ERROR([The standard <stdexcept> header file could not be found.]))
-AC_CHECK_HEADER(algorithm, , GINAC_ERROR([The standard <algorithm> header file could not be found.]))
-AC_CHECK_HEADER(limits, , GINAC_ERROR([The standard <limits> header file could not be found.]))
-if test "x$CONFIG_RUSAGE" = "xno"; then
-    AC_CHECK_HEADER(ctime, , GINAC_ERROR([The standard <ctime> header file could not be found.]))
-fi
-
-DL_LIBS=""
-dnl Check for dl library (needed for GiNaC::compile).
-AC_CHECK_LIB(dl, dlopen,
-       [
-               DL_LIBS="-ldl"
-               AC_DEFINE(HAVE_LIBDL, 1, [set to 1 if you have a working libdl installed.])
-       ], 
-       GINAC_WARNING([libdl not found. GiNaC::compile will be disabled.]))
-AC_SUBST(DL_LIBS)
+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.)
 
 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"
+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"
 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).
+AC_CHECK_TYPE(long long)
+
+dnl Check for stuff needed for building the GiNaC interactive shell (ginsh).
+AC_CHECK_HEADERS(unistd.h)
+GINAC_HAVE_RUSAGE
+GINAC_READLINE
+
+dnl Check for dl library (needed for GiNaC::compile).
+GINAC_EXCOMPILER

 
 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
 
 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


@@ -149,13 +121,16 @@ AM_CONDITIONAL(CONFIG_TEX, [test ! \( -z "$LATEX" -o -z $"PDFLATEX" -o -z "$MAKE
 AC_PATH_PROG(FIG2DEV, fig2dev, "")
 AM_CONDITIONAL(CONFIG_FIG2DEV, [test ! -z "$FIG2DEV"])
 
 AC_PATH_PROG(FIG2DEV, fig2dev, "")
 AM_CONDITIONAL(CONFIG_FIG2DEV, [test ! -z "$FIG2DEV"])
 

+dnl generate boilerplate code for the (new) parser.
+dnl Only developers need this tool.
+AC_PATH_PROG(AUTOGEN, autogen, "")
+

 dnl Output makefiles etc.
 AC_CONFIG_FILES([
 Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile
 dnl Output makefiles etc.
 AC_CONFIG_FILES([
 Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile

-ginac/version.h

 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1
 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1