X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=576a72bb46cf364fc0adb85f4543ce2bf74871dd;hp=a6fa0664c4e459b58fc047933d7b9fae89a7ae09;hb=a3009dfc5402f6253e9219201f48d972dd46984b;hpb=ab6bd00e2a10801a50efa5be5a88b4c99b0af30a diff --git a/configure.ac b/configure.ac index a6fa0664..576a72bb 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ dnl if backwards compatibility has been broken, dnl set ginac_binary_age and ginac_interface_age to 0. m4_define([ginac_major_version], [1]) -m4_define([ginac_minor_version], [4]) +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]) @@ -19,7 +19,7 @@ m4_define([ginac_interface_age], [0]) m4_define([ginac_binary_age], [0]) AC_INIT([GiNaC], ginac_version, []) -AC_PREREQ(2.52) +AC_PREREQ(2.59) AC_CONFIG_SRCDIR(ginac/basic.cpp) AC_CONFIG_HEADERS(config.h) dnl This defines PACKAGE and VERSION. @@ -44,8 +44,8 @@ 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=2 -ARCHIVE_AGE=2 +ARCHIVE_VERSION=3 +ARCHIVE_AGE=3 AC_SUBST(ARCHIVE_VERSION) AC_SUBST(ARCHIVE_AGE) @@ -71,52 +71,21 @@ AM_PROG_LIBTOOL 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 Make sure all the necessary standard headers are installed on the system. +GINAC_STD_CXX_HEADERS + +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 -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. -AC_CHECK_HEADER(iosfwd, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(iostream, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(vector, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(list, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(map, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(string, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(sstream, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(typeinfo, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(stdexcept, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(algorithm, , GINAC_ERROR([The standard header file could not be found.])) -AC_CHECK_HEADER(limits, , GINAC_ERROR([The standard header file could not be found.])) -if test "x$CONFIG_RUSAGE" = "xno"; then - AC_CHECK_HEADER(ctime, , GINAC_ERROR([The standard header file could not be found.])) -fi +GINAC_READLINE DL_LIBS="" dnl Check for dl library (needed for GiNaC::compile). @@ -149,6 +118,10 @@ 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"]) +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