From: Jens Vollinga Date: Fri, 20 May 2011 09:54:27 +0000 (+0200) Subject: ./configure now gives more information/warnings about missing utilities. X-Git-Tag: release_1-6-0~10 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=c152ba30b2938b3e1fe6927574883eff08dae88e ./configure now gives more information/warnings about missing utilities. --- diff --git a/acinclude.m4 b/acinclude.m4 index 06ac032a..1e53fa45 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -45,7 +45,7 @@ AC_REQUIRE([GINAC_TERMCAP]) GINSH_LIBS="" 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([readline headers could not be found.]) + GINAC_WARNING([ginsh will not compile, because readline headers could not be found.]) else AC_CACHE_CHECK([for version of libreadline], [ginac_cv_rl_supported], [ ginac_cv_rl_supported="no" @@ -57,13 +57,13 @@ else #endif]])], [ginac_cv_rl_supported="yes"])]) if test "x${ginac_cv_rl_supported}" != "xyes"; then - GINAC_WARNING([Unsupported version of readline (<= 4.2 or non-GNU).]) + GINAC_WARNING([ginsh will not compile, because of an unsupported version of readline (<= 4.2 or non-GNU).]) else save_LIBS="$LIBS" LIBS="$LIBTERMCAP $LIBS" AC_CHECK_LIB(readline, readline) if test "x${ac_cv_lib_readline_readline}" != "xyes"; then - GINAC_WARNING([libreadline could not be found.]) + GINAC_WARNING([ginsh will not compile, because libreadline could not be found.]) fi GINSH_LIBS="$LIBS" LIBS="$save_LIBS" @@ -121,6 +121,7 @@ dnl This macro displays a warning message if GINAC_ERROR or GINAC_WARNING dnl has occured previously. AC_DEFUN([GINAC_CHECK_ERRORS],[ if test "x${ginac_error}" = "xyes"; then + echo echo "**** The following problems have been detected by configure." echo "**** Please check the messages below before running \"make\"." echo "**** (see the section 'Common Problems' in the INSTALL file)" @@ -135,6 +136,7 @@ if test "x${ginac_error}" = "xyes"; then exit 1 else if test "x${ginac_warning}" = "xyes"; then + echo echo "=== The following minor problems have been detected by configure." echo "=== Please check the messages below before running \"make\"." echo "=== (see the section 'Common Problems' in the INSTALL file)" diff --git a/configure.ac b/configure.ac index 602a8448..fa8ab0e1 100644 --- a/configure.ac +++ b/configure.ac @@ -69,15 +69,14 @@ LT_RELEASE="1.5" AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_RELEASE) - dnl Check for the compiler and all the utilities needed for the build. AC_PROG_CXX AC_PROG_CXXCPP AC_PROG_INSTALL AM_PROG_LIBTOOL -AM_PROG_LEX +AC_PROG_LEX AC_PROG_YACC - +AC_PATH_PROG(YACCEXE, $YACC, "") dnl Switch to C++ language mode for the following libraries and headers. AC_LANG([C++]) @@ -104,6 +103,10 @@ 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 @@ -117,14 +120,23 @@ AM_CONDITIONAL(CONFIG_DOXYGEN, [test ! -z "$DOXYGEN"]) AC_PATH_PROG(LATEX, latex, "") AC_PATH_PROG(PDFLATEX, pdflatex, "") AC_PATH_PROG(MAKEINDEX, makeindex, "") +AC_PATH_PROG(MAKEINFO, makeinfo, "") 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 -z "$FIG2DEV" -o -z "$MAKEINFO"], + [GINAC_WARNING([Documentation may not build, because fig2dev/texinfo is missing.])]) +AS_IF([test -z "$DOXYGEN"], + [GINAC_WARNING([Reference manual will not build, because doxygen is missing.])]) +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([ @@ -148,5 +160,6 @@ doc/reference/DoxyfilePDF doc/reference/Doxyfooter ]) AC_OUTPUT + dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING GINAC_CHECK_ERRORS