[gftp/autotools: 5/12] build: Fix gettext support

[Javier Jardón <jjardon src gnome org>]

commit c2e2f44a31252a0e3de4bc5a3257cdbdd5cd1b61
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Sep 29 23:41:26 2013 +0100

    build: Fix gettext support

 Makefile.am    |    2 +-
 configure.ac   |    4 ++--
 m4/Makefile.am |    2 +-
 po/Makevars    |   16 ++++++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 063b7ba..6db39bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS= docs intl lib po src
+SUBDIRS= docs lib po src
 EXTRA_DIST= config.rpath ChangeLog-old README THANKS TODO \
  gftp.spec.in debian/changelog debian/compat debian/control debian/copyright \
  debian/gftp-common.dirs debian/gftp-common.docs debian/gftp-common.install \
diff --git a/configure.ac b/configure.ac
index 208dc78..c5c4ca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,13 +265,13 @@ if test "x$enable_ssl" = "xyes" ; then
 fi
 AC_SUBST(SSL_LIBS)
 
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT([external])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
 AC_CONFIG_FILES(po/Makefile.in
-       intl/Makefile
        Makefile
        docs/Makefile
        docs/sample.gftp/Makefile
diff --git a/m4/Makefile.am b/m4/Makefile.am
index befe52f..429f36f 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = inttypes-pri.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 
inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 
uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 
inttypes-pri.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 
inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 
uintmax_t.m4 ulonglong.m4
diff --git a/po/Makevars b/po/Makevars
index 9b58d09..33b33b7 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,6 +20,22 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Brian Masney
 
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =