[Bug-cpio] [PATCH 2/3] Fix po/Makefile.in.in and m4 macros version mismatch

[Giuseppe Scrivano]

* bootstrap: run autopoint before gnulib-tool to not overwrite gnulib files.
* configure.ac: use gettext version 19.
* gnulib.modules: use module gettext instead of gettext-h.
---
 bootstrap      | 27 +++++++++++++--------------
 configure.ac   |  2 +-
 gnulib.modules |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/bootstrap b/bootstrap
index aeb46e0..bfda2a5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -298,6 +298,19 @@ case ${GNULIB_SRCDIR--} in
   ;;
 esac
 
+
+# Import from gettext.
+with_gettext=yes
+grep '^[        ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+    with_gettext=no
+
+if test $with_gettext = yes; then
+    # Released autopoint has the tendency to install macros that have been
+    # obsoleted in current gnulib, so run this before gnulib-tool.
+    echo "$0: autopoint --force"
+    autopoint --force || exit
+fi
+
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
@@ -576,20 +589,6 @@ for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done
 
-
-# Import from gettext.
-with_gettext=yes
-grep '^[        ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
-    with_gettext=no
-
-if test $with_gettext = yes; then
-  echo "$0: (cd $bt2; autopoint) ..."
-  cp configure.ac $bt2 &&
-  (cd $bt2 && autopoint && rm configure.ac) &&
-  slurp $bt2 $bt || exit
-fi
-rm -fr $bt $bt2 || exit
-
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual
diff --git a/configure.ac b/configure.ac
index 1d3d985..3b26d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, 
strerror, getenv, a
 # Gettext.
 AM_ICONV
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION(0.18)
+AM_GNU_GETTEXT_VERSION(0.19)
 
 LIBS="$LIBS $LIB_CLOCK_GETTIME"
 
diff --git a/gnulib.modules b/gnulib.modules
index f165870..7b819af 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -12,7 +12,7 @@ fnmatch-gnu
 full-write
 getline
 getopt
-gettext-h
+gettext
 gitlog-to-changelog
 hash
 inttypes
-- 
2.4.3