Bump minimum Automake version to 1.11, required for AM_COND_IF

  use in LIBOPTS_CHECK.

bk: 4ce9e964r2W_PSVDgWHATpIQv5JkzA

diff --git a/ChangeLog b/ChangeLog
index 8809ead12378bd37a5ce4cbd6dbc59b7201c8856..a6f3af8287806accbc62da97a2f2ef20276a425d 100644 (file)
--- 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 <stenn@ntp.org>
@@ -96,7 +98,7 @@
 (4.2.6p2) 2010/07/09 Released by Harlan Stenn <stenn@ntp.org>
 
 * [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 83827db2747db743b389d54ded7ee520224c9cd8..23b580d0153bab31ad0045cffaec4e30c87babc3 100644 (file)
--- 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 14005f5fa6bb760ce47572a28d8660b8d0ce08ba..aff933b9d105af1ee1a7aead49564b70b8fb12c9 100644 (file)
--- 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 \