maint: tweak bootstrap.conf

* bootstrap.conf (buildreq): Require at least autoconf 2.62,
up from 2.61, just as grep and coreutils do.
(bootstrap_post_import_hook): "Copy pkg-config's pkg.m4 ...",
copied from grep's bootstrap.conf.
(avoided_gnulib_modules): Pull this definition to the top.
Formatting.

1 files changed, 35 insertions, 11 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index 1a20900..061df45 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -15,6 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+avoided_gnulib_modules='
+  --avoid=localename
+  --avoid=lock
+  --avoid=setlocale
+'
 
 # gnulib modules used by this package.
 gnulib_modules='
@@ -91,24 +96,26 @@ xvasprintf
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --flag=asnprintf:3:c-format\\\
+ --flag=asprintf:2:c-format\\\
  --from-code=UTF-8\\\
- --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
- --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
- --flag=message:1:c-format --flag=message5:1:c-format\\\
+ --flag=message:1:c-format\\\
+ --flag=message5:1:c-format\\\
  --flag=try_help:1:c-format\\\
+ --flag=vasprintf:2:c-format\\\
+ --flag=vasnprintf:3:c-format\\\
 '
 
-gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests
-  --avoid=localename
-  --avoid=lock
-  --avoid=setlocale
-  --symlink
-  --makefile-name=gnulib.mk
+gnulib_tool_option_extras="--tests-base=gnulib-tests
+ --with-tests
+ --symlink
+ --makefile-name=gnulib.mk
+ $avoided_gnulib_modules
 "
 
 # Build prerequisites
 buildreq="\
-autoconf   2.61
+autoconf   2.62
 automake   1.12.2
 autopoint  -
 gettext    0.19.2
@@ -122,10 +129,27 @@ rsync      -
 tar        -
 "
 
-bootstrap_post_import_hook()
+bootstrap_post_import_hook ()
 {
   # Automake requires that ChangeLog exist.
   touch ChangeLog || exit 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 $ac_dir /usr/share/aclocal ''
+  do
+    IFS=$oIFS
+    if test -n "$dir" && test -r "$dir/pkg.m4"; then
+      cp "$dir/pkg.m4" m4/pkg.m4
+      return
+    fi
+  done
+  IFS=$oIFS
+  die 'Cannot find pkg.m4; perhaps you need to install pkg-config'
 }
 
 bootstrap_epilogue()