From 7c55b6178841e99d6b953d8362f0968756d3a5bb Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 16 Oct 2017 15:28:31 +1300
Subject: [PATCH] Use automake 1.15.1 to bootstrap releases

The main change over 1.15 is compatibility with Perl 5.26.

(cherry picked from commit e24cc6018de09974316507e56039f9739a47a87e)
---
 bootstrap           | 6 +++---
 xapian-core/HACKING | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 3a2cd32f7..d3013c1fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -464,9 +464,9 @@ if lazy_build autoconf autoconf 2.69 \
   AUTOM4TE=$instdir/bin/autom4te
   export AUTOM4TE
 fi
-if lazy_build automake automake 1.15 \
-    tar.xz c279b35ca6c410809dac8ade143b805fb48b7655 \
-    tar.gz b5a840c7ec4321e78fdc9472e476263fa6614ca1 \
+if lazy_build automake automake 1.15.1 \
+    tar.xz 45632d466c16ecf18d9c18dc4be883cde59acb59 \
+    tar.gz d3cd5fc9bbea9f977b51799180cde5d253dcba96 \
     ; then
   ACLOCAL=$instdir/bin/aclocal
   export ACLOCAL
diff --git a/xapian-core/HACKING b/xapian-core/HACKING
index a9545e5c2..ade90d66c 100644
--- a/xapian-core/HACKING
+++ b/xapian-core/HACKING
@@ -509,7 +509,7 @@ Autotools versions
 
   autoconf 2.64 generates smaller configure scripts by using shell functions.
 
-* automake 1.15 is used to generate snapshots and releases.
+* automake 1.15.1 is used to generate snapshots and releases.
 
   automake 1.12.2 is a hard minimum requirement.  This version fixes a
   security issue (CVE-2012-3386) in the generated `make distcheck` rules.
-- 
2.11.4.GIT