X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=ea664ee108d93e23cc5fdfe2321078473372b2aa;hp=19c1c5066c807a9ef7cbd0907d6bf699f7d6dcb5;hb=77c2acd59e345fe7697304a865a8f41d43494129;hpb=f320e27e9cfe287168c879af5991babffaa1e9c8 diff --git a/configure.ac b/configure.ac index 19c1c506..ea664ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ 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], [5]) -m4_define([ginac_micro_version], [8]) +m4_define([ginac_minor_version], [6]) +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]) @@ -26,7 +26,7 @@ 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], [2]) m4_define([ginac_lt_revision], [0]) -m4_define([ginac_lt_age], [2]) +m4_define([ginac_lt_age], [0]) AC_INIT([GiNaC], ginac_version, [ginac-list@ginac.de], [ginac], [http://www.ginac.de/]) AC_PREREQ(2.59) @@ -97,10 +97,6 @@ dnl Check for stuff needed for building the GiNaC interactive shell (ginsh). AC_CHECK_HEADERS(unistd.h) GINAC_HAVE_RUSAGE GINAC_READLINE -AC_CHECK_FILE([ginsh/ginsh_parser.h], [], - [AS_IF([test -z "$YACCEXE"], [GINAC_WARNING([ginsh will not compile, because yacc/bison is missing.])])]) -AC_CHECK_FILE([ginsh/ginsh_lexer.cc], [], - [AS_IF([test x"$LEX" == x":"], [GINAC_WARNING([ginsh will not compile, because lex/flex is missing.])])]) dnl Check for dl library (needed for GiNaC::compile). GINAC_EXCOMPILER @@ -119,6 +115,10 @@ AC_PATH_PROG(DVIPS, dvips, "") AM_CONDITIONAL(CONFIG_TEX, [test ! \( -z "$LATEX" -o -z $"PDFLATEX" -o -z "$MAKEINDEX" -o -z "$DVIPS" \)]) AC_PATH_PROG(FIG2DEV, fig2dev, "") AM_CONDITIONAL(CONFIG_FIG2DEV, [test ! -z "$FIG2DEV"]) +AS_IF([test "x$LEX" = "x:" -a ! -f $srcdir/ginsh/ginsh_lexer.cc], + [GINAC_WARNING([ginsh will not compile, because lex/flex is missing])]) +AS_IF([test -z "$YACCEXE" -a ! -f $srcdir/ginsh/ginsh_parser.h], + [GINAC_WARNING([ginsh will not compile, because yacc/bison is missing])]) AS_IF([test -z "$FIG2DEV" -o -z "$MAKEINFO"], [GINAC_WARNING([Documentation may not build, because fig2dev/texinfo is missing.])]) AS_IF([test -z "$DOXYGEN"], @@ -126,12 +126,6 @@ AS_IF([test -z "$DOXYGEN"], AS_IF([test -z "$LATEX" -o -z "$PDFLATEX" -o -z "$DVIPS"], [GINAC_WARNING([Some documentation formats may not build, because latex/pdflatex/dvips is missing.])]) -dnl generate boilerplate code for the (new) parser. -dnl Only developers need this tool. -AC_PATH_PROG(AUTOGEN, autogen, "") -AC_CHECK_FILE([ginac/parser/builtin_fcns.cpp], [], - [AS_IF([test -z "$AUTOGEN"], [GINAC_ERROR([Source will not compile, because autogen is missing.])])]) - dnl Output makefiles etc. AC_CONFIG_FILES([ Makefile