[Bug 3516] Require tooling from this decade

bk: 5cdda0f9XxhplZti9pN-zjwQ6Rl73w

diff --git a/ChangeLog b/ChangeLog
index fd115dd5cfb6929cf009f604736472952e88e615..7001f9b3675b3ee6627bdec462d34f63175e6132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 ---
+* [Bug 3516] Require tooling from this decade <perlinger@ntp.org>
+  - patch by Philipp Prindeville
 * [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger@ntp.org>
   - patch by Philipp Prindeville
 

diff --git a/configure.ac b/configure.ac
index 7975d31a97e0c3d95b637d4857c84d8aeefe4fc4..19001f629099d9b9ddcc86ce20f1f0180c00b9fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl NTP top-level configure.ac                         -*- Autoconf -*-
 dnl
 m4_include([sntp/m4/version.m4])
-AC_PREREQ([2.61])
+AC_PREREQ([2.68])
 AC_INIT(
     [ntp],
     [VERSION_NUMBER],
@@ -42,13 +42,10 @@ ntp_configure_cache_version=20120806
 
 NTP_CACHEVERSION([main], [$ntp_configure_cache_version])
 
-AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
+AM_INIT_AUTOMAKE([1.15 foreign -Wall -Wno-gnu])
+
+AM_SILENT_RULES([yes])
 
-dnl AM_SILENT_RULES req. automake 1.11.  [yes] defaults V=0
-m4_ifdef(
-    [AM_SILENT_RULES],
-    [AM_SILENT_RULES([yes])]
-)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 dnl the 'build' machine is where we run configure and compile

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 5a70c5af636a0f60b26cba9a2d62e6adaa27c34d..f6de8a134565a71764253667ec70315b8b1e3ba2 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -1,7 +1,7 @@
 dnl SNTP subpackage configure.ac                       -*- Autoconf -*-
 dnl
 m4_include([m4/version.m4])
-AC_PREREQ([2.61])
+AC_PREREQ([2.68])
 AC_INIT(
     [sntp],
     [VERSION_NUMBER],
@@ -40,12 +40,10 @@ sntp_configure_cache_version=20120806
 
 NTP_CACHEVERSION([sntp], [$sntp_configure_cache_version])
 
-AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
-dnl AM_SILENT_RULES req. automake 1.11.  [yes] defaults V=0
-m4_ifdef(
-    [AM_SILENT_RULES],
-    [AM_SILENT_RULES([yes])]
-)
+AM_INIT_AUTOMAKE([1.15 foreign -Wall -Wno-gnu])
+
+AM_SILENT_RULES([yes])
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 dnl the 'build' machine is where we run configure and compile