build: fix fresh checkout on RHEL5

Building a fresh checkout on RHEL 5 has been broken since commit
29db7a00, due to a gnulib regression in the bootstrap script
(incremental builds from a checkout earlier than that point were
okay, though).

* .gnulib: Update to latest, for bootstrap fixes.
* bootstrap: Resync from gnulib.
* gnulib/local/top/maint.mk.diff: Drop patch that was added
upstream in the meantime.

diff --git a/.gnulib b/.gnulib
index d5612c714c87555f1059d71d347e20271dced322..f15a17dc1f5d2b1fc8a423795c54b211552c0483 160000 (submodule)
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit d5612c714c87555f1059d71d347e20271dced322
+Subproject commit f15a17dc1f5d2b1fc8a423795c54b211552c0483

diff --git a/bootstrap b/bootstrap
index 31eb651f64bd38de1e33e464c7505a6ddd6540c1..5aa73cc1b7067a67352c1d091c5b60e8271feb26 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-02-11.09; # UTC
+scriptversion=2012-04-19.22; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -36,6 +36,10 @@ nl='
 LC_ALL=C
 export LC_ALL
 
+# Ensure that CDPATH is not set.  Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 local_gl_dir=gl
 
 me=$0
@@ -758,9 +762,15 @@ fi
 # Autoreconf runs aclocal before libtoolize, which causes spurious
 # warnings if the initial aclocal is confused by the libtoolized
 # (or worse out-of-date) macro directory.
+# libtoolize 1.9b added the --install option; but we support back
+# to libtoolize 1.5.22, where the install action was default.
 if test $use_libtool = 1; then
-  echo "running: $LIBTOOLIZE --copy --install"
-  $LIBTOOLIZE --copy --install
+  install=
+  case $($LIBTOOLIZE --help) in
+    *--install*) install=--install ;;
+  esac
+  echo "running: $LIBTOOLIZE $install --copy"
+  $LIBTOOLIZE $install --copy
 fi
 
 version_controlled_file() {
@@ -863,6 +873,8 @@ if test $with_gettext = yes; then
     }
   ' po/Makevars.template >po/Makevars || exit 1
 
+  cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1
+
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
     rm -f runtime-po/Makevars

diff --git a/gnulib/local/top/maint.mk.diff b/gnulib/local/top/maint.mk.diff
deleted file mode 100644 (file)
index 85e97ae..0000000
--- a/gnulib/local/top/maint.mk.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git i/top/maint.mk w/top/maint.mk
-index 4cbd5f4..2228a37 100644
---- i/top/maint.mk
-+++ w/top/maint.mk
-@@ -279,7 +279,7 @@ define _sc_search_regexp
-    if test -n "$$files"; then                                         \
-      if test -n "$$prohibit"; then                                    \
-        grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \
--         | grep -vE "$${exclude-^$$}"                                 \
-+         | grep -vE "$${exclude:-^$$}"                                        \
-          && { msg="$$halt" $(_sc_say_and_exit) } || :;                        \
-      else                                                             \
-        grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \
-@@ -455,7 +455,8 @@ sc_prohibit_quotearg_without_use:
-
- # Don't include quote.h unless you use one of its functions.
- sc_prohibit_quote_without_use:
--      @h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use)
-+      @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \
-+        $(_sc_header_without_use)
-
- # Don't include this header unless you use one of its functions.
- sc_prohibit_long_options_without_use:
-@@ -1332,7 +1333,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks)
-       $(MAKE) vc-diff-check
-       $(MAKE) news-check
-       $(MAKE) distcheck
--      $(MAKE) dist XZ_OPT=-9ev
-+      $(MAKE) dist
-       $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
-       $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
-