X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=837448b84ebb87a91ed98c8783e3d23dfd8406da;hp=40118f716562d8fbc7e5919a9dac4884bf20a71e;hb=2862087ce55d944c1ac5d37283944b2b37507fd2;hpb=d44ad7a1e65cfb2a8ca56382609cc22b2e6e07c4 diff --git a/configure.in b/configure.in index 40118f71..837448b8 100644 --- a/configure.in +++ b/configure.in @@ -18,10 +18,10 @@ dnl autoconf sees "AC_MAJOR_VERSION" and complains about an undefined macro dnl (don't we all *love* M4?)... GINACLIB_MAJOR_VERSION=0 -GINACLIB_MINOR_VERSION=5 -GINACLIB_MICRO_VERSION=2 -GINACLIB_INTERFACE_AGE=2 -GINACLIB_BINARY_AGE=2 +GINACLIB_MINOR_VERSION=9 +GINACLIB_MICRO_VERSION=3 +GINACLIB_INTERFACE_AGE=0 +GINACLIB_BINARY_AGE=0 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION AC_SUBST(GINACLIB_MAJOR_VERSION) @@ -34,14 +34,14 @@ AC_SUBST(GINACLIB_VERSION) 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, ARCHIVE_AGE to 0. +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=0 -ARCHIVE_AGE=0 +ARCHIVE_VERSION=1 +ARCHIVE_AGE=1 AC_SUBST(ARCHIVE_VERSION) AC_SUBST(ARCHIVE_AGE) @@ -62,7 +62,6 @@ AC_SUBST(LT_AGE) dnl This defines PACKAGE and VERSION. AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([GiNaC], $GINACLIB_VERSION) -AM_MAINTAINER_MODE dnl Check for the compiler and all the utilities needed for the build. AC_PROG_CXX @@ -73,11 +72,11 @@ AM_PROG_LEX AC_PROG_YACC dnl Configure options. -AC_ARG_ENABLE(html-doc, [ --enable-html-doc build HTML documentation [default=yes]], , enable_html_doc=yes) -AC_ARG_ENABLE(ps-doc, [ --enable-ps-doc build PostScript documentation [default=yes]], , enable_ps_doc=yes) -AC_ARG_WITH(cint, [ --with-cint=CINTSYSDIR build GiNaC-cint C++ interpreter [default=no]], , with_cint=no) +AC_ARG_ENABLE(html-doc, [ --enable-html-doc build HTML documentation [default=no]], , enable_html_doc=no) +AC_ARG_ENABLE(ps-doc, [ --enable-ps-doc build PostScript documentation [default=no]], , enable_ps_doc=no) -dnl Check for data types which are needed by the hash function (golden_ratio_hash). +dnl Check for data types which are needed by the hash function +dnl (golden_ratio_hash). AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(long double, 12) @@ -91,20 +90,19 @@ 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 +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 the following libraries work by testing for symbols therein. -dnl They are automatically added the the variable $LIBS and thus passed into -dnl the Makefile: -AC_CHECK_LIB(stdc++, cout) - dnl Make sure all the necessary new-style headers are installed on the system. dnl If one of them cannot be found the system is probably not ANSI-conform dnl enough so trying the .h-style headers is a waste of time. @@ -112,9 +110,13 @@ AC_CHECK_HEADERS(iostream vector map string list typeinfo iterator stdexcept alg AC_MSG_ERROR(need to have ANSI compliant headers)) AC_CHECK_HEADERS(sstream strstream) -dnl We need to have Bruno Haible's CLN installed (macros are in acinclude.m4): -GINAC_CHECK_CLN_H -GINAC_CHECK_LIBCLN +dnl We need to have Bruno Haible's CLN installed. +dnl (CLN versions >= 1.1.0 must have installed cln.m4 at a visible place, +dnl which provides this macro): +AC_PATH_CLN(1.1.0, [ + LIBS="$LIBS $CLN_LIBS" + CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" +], GINAC_ERROR([No suitable installed version of CLN could be found.])) dnl Expand the cppflags and libraries needed by apps using GiNaC GINACLIB_CPPFLAGS=$CPPFLAGS @@ -149,56 +151,22 @@ fi AC_SUBST(TUTORIAL_TARGETS) AC_SUBST(REFERENCE_TARGETS) -dnl Configure GiNaC-cint -LIBGINACCINT= -GINACCINTDIR= -if test "x$with_cint" != "xno"; then - if test "x$enable_static" != "xyes"; then - AC_MSG_ERROR([currently GiNaC-cint needs to build a static libginac]) - fi - if test "x$with_cint" = "xyes"; then - if test "x$CINTSYSDIR" = "x"; then - AC_MSG_ERROR([please export \$CINTSYSDIR or specify --with-cint=CINTSYSDIR]) - fi - else - CINTSYSDIR=$with_cint - export CINTSYSDIR - fi - AC_PATH_PROG(CINT, cint, "", $CINTSYSDIR:$PATH) - AC_PATH_PROG(MAKECINT, makecint, "", $CINTSYSDIR:$PATH) - if [[ "$CINT" -a "$MAKECINT" ]]; then - AC_MSG_RESULT([creating cint/Makefile]) - (cd cint && \ - $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \ - -D OBSCURE_CINT_HACK -D CINT_CONVERSION_WORKAROUND -D NO_NAMESPACE_GINAC \ - -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h dummies.h \ - -C++ dummies.cpp -C++ ginaccint.bin.cpp \ - -l ./libginac.a -lcln -cint -M0x10; \ - cd ..) - LIBGINACCINT="libginac.a" - GINACCINTDIR="cint" - else - AC_MSG_ERROR([Cannot configure GiNaC-cint]) - fi -fi -AC_SUBST(CINTSYSDIR) -AC_SUBST(LIBGINACCINT) -AC_SUBST(GINACCINTDIR) - dnl Output makefiles etc. AC_OUTPUT([ Makefile GiNaC.spec ginac-config +ginac-config.1 ginac/Makefile +ginac/version.h check/Makefile ginsh/Makefile +ginsh/ginsh.1 tools/Makefile +tools/viewgar.1 doc/Makefile doc/tutorial/Makefile doc/reference/Makefile -cint/Makefile -cint/ginaccint -], [chmod +x ginac-config cint/ginaccint]) +], [chmod +x ginac-config]) dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING GINAC_CHECK_ERRORS