From 26b586fbb6cbf6f04bd9d55aabb18c8a2bc175e2 Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Mon, 22 Nov 2010 03:54:12 +0000 Subject: [PATCH] Bump minimum Automake version to 1.11, required for AM_COND_IF use in LIBOPTS_CHECK. bk: 4ce9e964r2W_PSVDgWHATpIQv5JkzA --- ChangeLog | 4 +++- Makefile.am | 3 ++- sntp/Makefile.am | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8809ead12..a6f3af828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * Remove log_msg() and debug_msg() from sntp in favor of msyslog(). * Use a single copy of libopts/, in sntp/. * Upgrade libopts to 33.3.8. +* Bump minimum Automake version to 1.11, required for AM_COND_IF + use in LIBOPTS_CHECK. --- (4.2.6p3-RC10) 2010/11/14 Released by Harlan Stenn @@ -96,7 +98,7 @@ (4.2.6p2) 2010/07/09 Released by Harlan Stenn * [Bug 1581] size_t printf format string mismatches, IRIG string buffers - undersized. Mostly backported from earlier ntp-dev fixes by Jürgen + undersized. Mostly backported from earlier ntp-dev fixes by Juergen Perlinger. --- diff --git a/Makefile.am b/Makefile.am index 83827db27..23b580d01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -AUTOMAKE_OPTIONS = foreign 1.10 +## LIBOPTS_CHECK patch requires AM_COND_IF, thereby automake 1.11 +AUTOMAKE_OPTIONS = foreign 1.11 ACLOCAL_AMFLAGS = -I m4 -I sntp/libopts/m4 NULL = diff --git a/sntp/Makefile.am b/sntp/Makefile.am index 14005f5fa..aff933b9d 100644 --- a/sntp/Makefile.am +++ b/sntp/Makefile.am @@ -2,7 +2,8 @@ NULL = -AUTOMAKE_OPTIONS = foreign 1.10 +## LIBOPTS_CHECK patch requires AM_COND_IF, thereby automake 1.11 +AUTOMAKE_OPTIONS = foreign 1.11 ACLOCAL_AMFLAGS = -I ../m4 -I libopts/m4 AM_CPPFLAGS = $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include \ -- 2.47.3