Undo previous change, then add comment as to why the

AM_LANGINFO_CODESET hack is needed.

diff --git a/bootstrap b/bootstrap
index 7b2f4c5072c4225571e9932094ab5992cd60f966..96c9bcb30aa09fb227b16fe84c9df22131448f01 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -154,6 +154,14 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
+# This suppresses a bogus diagnostic
+# "warning: macro `AM_LANGINFO_CODESET' not found in library".
+echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
+sed '
+  /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+    AC_DEFUN([AM_INTL_SUBDIR], [])
+' m4/gettext.m4 >m4/gettext_gl.m4 || exit
+
 
 # Get translations.