From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 18 Jun 2012 07:49:19 +0000 (+0000)
Subject: Automake-1.12 wants us to use AM_PROG_AR
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7e1007a2830fb640d43d5055cf96150bd472635;p=thirdparty%2Fntp.git

Automake-1.12 wants us to use AM_PROG_AR

bk: 4fdedd7ffe-aLyCbxfUljtl9BEca2w
---

diff --git a/ChangeLog b/ChangeLog
index b22969d051..2c3a90cb08 100644
--- 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 a51dbf9a0f..ed1ba4079e 100644
--- 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 66d1b2595c..4f3e783f69 100644
--- 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