summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c3b323b..7d940789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 27 11:54:17 GMT 2013 Colin Watson <cjwatson@debian.org>
+
+ * configure.ac: Only call AC_PROG_AR if it is defined, to restore
+ compatibility with Automake 1.10.
+ * NEWS: Document this.
+
Wed Nov 27 11:48:29 GMT 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.14 and Gnulib 20130805.
diff --git a/NEWS b/NEWS
index fea47e1d..f26215e4 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Major changes since man-db 2.6.5:
o apropos's --and option now works again; it was broken by the
optimisations in 2.6.2.
+ o Restore compatibility with Automake 1.10.
+
man-db 2.6.5 (27 June 2013)
===========================
diff --git a/configure.ac b/configure.ac
index adde4085..a3477b96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([src/man.c])
AC_GNU_SOURCE
-AM_PROG_AR
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT([disable-static])
if test ! -f "$srcdir/gnulib/po/Makefile.in.in"; then