From 9921e9e79f5f4290e59d88f78a9606775aad577d Mon Sep 17 00:00:00 2001 From: "David Adam (zanchey)" Date: Fri, 6 Sep 2013 10:41:58 +0800 Subject: [PATCH] document and enforce Autoconf 2.60 or greater --- README.md | 4 +++- configure.ac | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c0b8c69a8..c74624656 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@ Detailed user documentation is available by running `help` within fish, and also fish is written in a sane subset of C++98, with a few components from C++TR1. It builds successfully with g++ 4.2 or later, and with clang. It also will build as C++11. -fish can be built using autotools or Xcode. +fish can be built using autotools or Xcode. autoconf 2.60 or later is required. + +fish requires gettext for translation support. ### Autotools Build diff --git a/configure.ac b/configure.ac index 1bff836da..21e043afc 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ m4_syscmd([build_tools/git_version_gen.sh 2>/dev/null]) +AC_PREREQ([2.60]) AC_INIT(fish, m4_esyscmd([cut -f 3 -d ' ' FISH-BUILD-VERSION-FILE | tr -d '\n']), fish-users@lists.sf.net) @@ -212,6 +213,7 @@ AS_IF([test "$use_doxygen" != "no"], AC_MSG_CHECKING([the doxygen version]) doxygen_version=`doxygen --version 2>/dev/null` AC_MSG_RESULT([$doxygen_version]) + dnl This requires autoconf 2.60 or newer AS_VERSION_COMPARE([$doxygen_version], [$doxygen_minimum], [ if test "$use_doxygen" = auto; then AC_MSG_WARN([doxygen version $doxygen_version found, but $doxygen_minimum required])