From 73ff00e47f3041c53af4576f34bab99296c7470a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 2 Apr 2014 21:03:32 +0000 Subject: [PATCH] Upping the required version of Automake, to ensure the ONCE macros are defined. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4706 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ configure.ac | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0ec8dc94..6cbf1b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2014-04-02 Benno Schulenberg * configure.ac, doc/Makefile.am: Try to build the info documentation only when 'makeinfo' is available. Patch partly by Mike Frysinger. + * configure.ac: Upping the required version of Automake, to ensure the + ONCE macros are defined. Suggested by Kamil Dudka and Mike Frysinger. 2014-04-02 Mike Frysinger * doc/man/{,fr}/Makefile.am: Simplify the man rules still further. diff --git a/configure.ac b/configure.ac index cf344be4..f80649c7 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,9 @@ AC_CANONICAL_HOST AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) -AC_PREREQ(2.54) +dnl Make sure the ONCE macros are available. + +AC_PREREQ(2.61) dnl Checks for programs. @@ -415,12 +417,15 @@ fi dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for available flags. + AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], []) dnl Checks for library functions. + AC_TYPE_SIGNAL AC_FUNC_VPRINTF AC_CHECK_FUNCS(getopt_long) + dnl Checks for libraries. if eval "test x$CURSES_LIB_NAME = x"; then -- 2.39.5