From 14a711849925748aa48b6512b1a0ad106d3b00f0 Mon Sep 17 00:00:00 2001 From: Mark Griffiths Date: Tue, 5 Aug 2014 18:43:33 +0100 Subject: [PATCH] Revert 60b9f8d..e4d6eaf This rolls back to commit 60b9f8db18b8889c3db864e443ee113d897bfe72. --- README.md | 2 +- build_tools/build_documentation.sh | 6 ------ configure.ac | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2cbd66321..b69b8dbee 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ fish depends on a curses implementation, such as ncurses. The headers and librar fish requires gettext for translation support. -Building the documentation requires Doxygen 1.8 or newer. +Building the documentation requires Doxygen 1.5 or newer. ### Autotools Build diff --git a/build_tools/build_documentation.sh b/build_tools/build_documentation.sh index 77eaad687..2705898e9 100755 --- a/build_tools/build_documentation.sh +++ b/build_tools/build_documentation.sh @@ -68,12 +68,6 @@ if test -z "$DOXYGENPATH"; then exit 0 fi -# Check we have the lexicon filter -if test -z "$INPUT_FILTER"; then - echo >&2 "Lexicon filter is not available. Continuing without." - INPUTFILTER='' -fi - # Determine where our output should go if ! mkdir -p "${OUTPUTDIR}" ; then echo "Could not create output directory '${OUTPUTDIR}'" diff --git a/configure.ac b/configure.ac index f36e26025..037ee8fad 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ AS_IF([test x$local_gettext != xno], # Build/clean the documentation only if Doxygen is available # -doxygen_minimum=1.8 +doxygen_minimum=1.5 AC_ARG_WITH( doxygen,