Automake-1.12 wants us to use AM_PROG_AR

bk: 4fdedd7ffe-aLyCbxfUljtl9BEca2w

diff --git a/ChangeLog b/ChangeLog
index b22969d05187bf76ca2d903af1b3a7e15ca6b2e6..2c3a90cb0820721e9cd0bf6f45a3041af1c28ef6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 2227] Enable mrulist access control via "restrict ... nomrulist".
+* Automake-1.12 wants us to use AM_PROG_AR.
 * Conditionalize msyslog messages about rejected mode 6 requests due to
   nomodify and nomrulist restrictions under "logconfig +sysinfo".
 * Increment sys_restricted in a few rejection paths due to nomodify

diff --git a/configure.ac b/configure.ac
index a51dbf9a0f1d09da3945898db170fb20cb7526da..ed1ba4079ebef1b035e6455de6d4fa9e399317da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,12 @@ NTP_VPATH_HACK               dnl used only by ntpd/Makefile.am
 
 NTP_LOCINFO([sntp])    dnl takes over from NTP_BINDIR, in NTP_LIBNTP
 
+dnl AM_PROG_AR req. automake 1.12
+m4_ifdef(
+    [AM_PROG_AR],
+    [AM_PROG_AR]
+)
+
 # So far, the only shared library we might use is libopts.
 # It's a small library - we might as well use a static version of it.
 AC_DISABLE_SHARED

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 66d1b2595c7fe9602330c078c08af08806de1550..4f3e783f69f53e30c99066c2964a3d99ab0f9714 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -57,6 +57,12 @@ NTP_PROG_CC
 
 NTP_LOCINFO()
 
+dnl AM_PROG_AR req. automake 1.12
+m4_ifdef(
+    [AM_PROG_AR],
+    [AM_PROG_AR]
+)
+
 NTP_LIBNTP
 
 AC_DISABLE_SHARED