aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mark Griffiths <mark@thebespokepixel.com>2014-08-05 18:43:33 +0100
committerGravatar Mark Griffiths <mark@thebespokepixel.com>2014-09-03 14:43:26 +0100
commit14a711849925748aa48b6512b1a0ad106d3b00f0 (patch)
treed411a84c08821c0dc1136762ec357246e4690e95
parentafdabd97ff2f0b8a3f52565e0a6306d1bfdc44fe (diff)
Revert 60b9f8d..e4d6eaf
This rolls back to commit 60b9f8db18b8889c3db864e443ee113d897bfe72.
-rw-r--r--README.md2
-rwxr-xr-xbuild_tools/build_documentation.sh6
-rw-r--r--configure.ac2
3 files changed, 2 insertions, 8 deletions
diff --git a/README.md b/README.md
index 2cbd6632..b69b8dbe 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 77eaad68..2705898e 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 f36e2602..037ee8fa 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,