From d34269c09dffc4dae884fc1fc63384c6ef706a1d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 17 Oct 2015 16:26:58 -0700
Subject: [PATCH 1/2] build: avoid spurious bootstrap failure involving pkg.m4

Running ./bootstrap could fail mistakenly at the very end in
its attempt to obtain a copy of pkg.m4.  It would search only
$(aclocal --print-ac-dir) and some other directories, but not
those listed in $(aclocal --print-ac-dir)/dirlist.
* bootstrap.conf (bootstrap_post_import_hook): Also search the
directories named in $(aclocal --print-ac-dir)/dirlist when that
file exists with nonzero size.
---
 bootstrap.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 7842928..9db620b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -136,10 +136,12 @@ bootstrap_post_import_hook ()
   touch ChangeLog || return 1

   # Copy pkg-config's pkg.m4 so that our downstream users don't need to.
+  local ac_dir=`aclocal --print-ac-dir`
+  test -s "$ac_dir/dirlist" && ac_dir=$ac_dir:`tr '\n' : < "$ac_dir/dirlist"`
   oIFS=$IFS
   IFS=:
   for dir in \
-    $ACLOCAL_PATH $(aclocal --print-ac-dir) /usr/share/aclocal ''
+    $ACLOCAL_PATH $ac_dir /usr/share/aclocal ''
   do
     IFS=$oIFS
     if test -n "$dir" && test -r "$dir/pkg.m4"; then
-- 
2.6.0