[cogl/cogl-1.22] Upgrade to gettext 0.19 to avoid hack in autogen.sh

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

commit 96d8be620a415ae5493f2b040aa37d4d57a0fc51
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Jan 7 17:48:37 2016 +0000

    Upgrade to gettext 0.19 to avoid hack in autogen.sh
    
    Using the 'PO_DEPENDS_ON_POT = no' and
    'DIST_DEPENDS_ON_UPDATE_PO = no' in po/Makevars
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760285

 autogen.sh    |    4 ----
 configure.ac  |    2 +-
 po/Makevars   |   37 +++++++++++++++++++++++++++++++++++++
 po/Rules-quot |   47 -----------------------------------------------
 4 files changed, 38 insertions(+), 52 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index fa228c5..10b4dd3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,10 +16,6 @@ test $TEST_TYPE $FILE || {
        exit 1
 }
 
-# GNU gettext automake support doesn't get along with git.
-# https://bugzilla.gnome.org/show_bug.cgi?id=661128
-touch -t 200001010000 po/cogl.pot
-
 AUTOMAKE_VERSIONS="1.15 1.14 1.13 1.12 1.11"
 for version in $AUTOMAKE_VERSIONS; do
        if automake-$version --version < /dev/null > /dev/null 2>&1 ; then
diff --git a/configure.ac b/configure.ac
index 3e37ed4..e9d24d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1278,7 +1278,7 @@ AC_SUBST(GDKPIXBUF_PREFIX)
 dnl ================================================================
 dnl I18n stuff.
 dnl ================================================================
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.19])
 AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE="cogl"
diff --git a/po/Makevars b/po/Makevars
index e553815..212a70e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
+# 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
@@ -39,3 +46,33 @@ MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 # 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