maint: update prereq version of gettext

* configure.ac: Increase designated gettext version to 0.19.2
* bootstrap.conf (buildreq): Likewise.
Remove now-unnecessary code to remove gettext-provided files.

1 files changed, 3 insertions, 54 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index d5bb5c8..ec9f895 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -96,51 +96,6 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=try_help:1:c-format\\\
 '
 
-# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
-# appears in configure.ac, exclude some unnecessary files.
-# Without grep's -E option (not portable enough, pre-configure),
-# the following test is ugly.  Also, this depends on the existence
-# of configure.ac, not the obsolescent-named configure.in.  But if
-# you're using this infrastructure, you should care about such things.
-
-gettext_external=0
-grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
-  gettext_external=1
-grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
-  gettext_external=1
-
-needed_gnulib_files=
-unnecessary_gettext_files=
-
-if test $gettext_external = 1; then
-  # Gettext supplies these files, but we don't need them since
-  # we don't have an intl subdirectory.
-  unnecessary_gettext_files='
-    m4/glibc2.m4
-    m4/intdiv0.m4
-    m4/intl.m4
-    m4/intldir.m4
-    m4/intmax.m4
-    m4/lcmessage.m4
-    m4/lock.m4
-    m4/printf-posix.m4
-    m4/threadlib.m4
-    m4/uintmax_t.m4
-    m4/visibility.m4
-  '
-
-  # Gettext supplies these files, but the gnulib version of these files
-  # typically is more up-to-date.  We don't use gnulib's gettext module,
-  # as it's too heavyweight, so grab the files one at a time instead.
-  needed_gnulib_files='
-    m4/gettext.m4
-    m4/intlmacosx.m4
-    m4/nls.m4
-    m4/po.m4
-    m4/progtest.m4
-  '
-fi
-
 gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests
   --avoid=localename
   --avoid=lock
@@ -153,7 +108,7 @@ buildreq="\
 autoconf   2.61
 automake   1.12.2
 autopoint  -
-gettext    -
+gettext    0.19.2
 git        1.4.4
 gperf      -
 gzip       -
@@ -164,16 +119,10 @@ rsync      -
 tar        -
 "
 
-# Automake requires that ChangeLog exist.
-touch ChangeLog || exit 1
-
 bootstrap_post_import_hook()
 {
-  for file in $needed_gnulib_files; do
-    echo "$0: $gnulib_tool --copy-file $file $file ..."
-    $gnulib_tool --copy-file $file $file || exit
-  done
-  rm -f $unnecessary_gettext_files || exit
+  # Automake requires that ChangeLog exist.
+  touch ChangeLog || exit 1
 }
 
 bootstrap_epilogue()