[yelp-xsl: 1/4] Use upstream gettext instead intltool

[Shaun McCance <shaunm src gnome org>]

commit 655b931b8c0aeaabe382e1afcb43b450cc099cc4
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jul 11 23:21:22 2016 +0100

    Use upstream gettext instead intltool
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681556
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
    
    Closes: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/17

 .gitignore         |   3 -
 Makefile.am        |  10 +-
 autogen.sh         |   7 -
 configure.ac       |   5 +-
 m4/.gitignore      |   1 -
 m4/glib-gettext.m4 | 433 -----------------------------------------------------
 po/.gitignore      |   1 -
 po/Makevars        |  78 ++++++++++
 po/POTFILES.in     |   1 -
 9 files changed, 82 insertions(+), 457 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 079b87ad..e1756dae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,6 @@ config.status
 config.sub
 configure
 install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 missing
 yelp-xsl.pc
 
diff --git a/Makefile.am b/Makefile.am
index 4ad2f638..00c6da45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,15 +10,7 @@ EXTRA_DIST =                                                 \
        $(pkgdata_DATA)                                 \
        ChangeLog                                       \
        COPYING.GPL                                     \
-       COPYING.LGPL                                    \
-       intltool-extract.in                             \
-       intltool-merge.in                               \
-       intltool-update.in
-
-DISTCLEANFILES =                                       \
-       intltool-extract                                \
-       intltool-merge                                  \
-       intltool-update
+       COPYING.LGPL
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-doc
 
diff --git a/autogen.sh b/autogen.sh
index 413dd103..eff2505a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,13 +13,6 @@ if test -z $AUTORECONF; then
         exit 1
 fi
 
-INTLTOOLIZE=`which intltoolize`
-if test -z $INTLTOOLIZE; then
-        echo "*** intltoolize not found. Install intltool. ***"
-        exit 1
-fi
-
-intltoolize --automake --copy
 autoreconf --force --install --verbose
 
 cd $olddir
diff --git a/configure.ac b/configure.ac
index 8ca6a165..59fa63ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,13 @@ if test "$ITSTOOL_VERSION" -lt 10200; then
 fi
 
 # i18n stuff
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=yelp-xsl
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
-IT_PROG_INTLTOOL([0.40.0])
-
 ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AC_SUBST(ALL_LINGUAS)
 
diff --git a/po/.gitignore b/po/.gitignore
index b16f2d01..30f27f6c 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,7 +1,6 @@
 *.gmo
 *.mo
 *.pot
-.intltool-merge-cache
 Makefile
 Makefile.in
 Makefile.in.in
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..465764e3
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Shaun McCance <shaunm redhat com>
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# 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 =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d5ccf579..ca4f3791 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 xslt/common/domains/yelp-xsl.pot