[glib] Use upstream gettext instead the glib one

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

commit e5c752371c7fb1343eff27b5f1d0bcbef4e333b9
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Jul 15 20:37:44 2014 +0000

    Use upstream gettext instead the glib one
    
    https://bugzilla.gnome.org/show_bug.cgi?id=622991

 Makefile.am          |    1 +
 configure.ac         |   14 +---
 gio/Makefile.am      |    1 +
 glib/Makefile.am     |    1 +
 m4macros/Makefile.am |   11 ++-
 po/Makefile.in.in    |  268 --------------------------------------------------
 po/Makevars          |   89 +++++++++++++++++
 7 files changed, 104 insertions(+), 281 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a1c9c33..0cd5e17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST +=                         \
        ChangeLog.pre-2-2       \
        ChangeLog.pre-2-0       \
        ChangeLog.pre-1-2       \
+       config.rpath            \
        glib-zip.in             \
        NEWS.pre-1-3            \
        acglib.m4               \
diff --git a/configure.ac b/configure.ac
index b9fb0e9..1a28fd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,16 +462,8 @@ dnl
 dnl gettext support
 dnl
 
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
-GLIB_GNU_GETTEXT
-
-if test "$gt_cv_have_gettext" != "yes" ; then
-  AC_MSG_ERROR([
-*** You must have either have gettext support in your C library, or use the 
-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
-])
-fi
+AM_GNU_GETTEXT_VERSION([0.19.2])
+AM_GNU_GETTEXT([external])
 
 LIBS="$INTLLIBS $LIBS"
 
@@ -480,8 +472,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], 
   [Define the gettext package to be used])
 
-GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR)
-
 dnl
 dnl Now we are done with gettext checks, figure out ICONV_LIBS
 dnl
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 3aff3e5..d2ecb07 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -23,6 +23,7 @@ uninstall-ms-lib:
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
+       -DGLIB_LOCALE_DIR=\"$(localedir)\"              \
        $(gmodule_INCLUDES)                             \
        $(GLIB_DEBUG_FLAGS)                             \
        -DGIO_COMPILATION                               \
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 2783b51..398c360 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -40,6 +40,7 @@ AM_CPPFLAGS =                                 \
        $(glib_INCLUDES)                \
        $(pcre_inc)                     \
        -DG_LOG_DOMAIN=\"GLib\"         \
+       -DGLIB_LOCALE_DIR=\"$(localedir)\" \
        $(GLIB_DEBUG_FLAGS)             \
        -DGLIB_COMPILATION              \
        -DPCRE_STATIC
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index 971871c..f80622f 100644
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -2,7 +2,16 @@ include $(top_srcdir)/glib.mk
 
 installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4
 
-EXTRA_DIST+=$(installed_m4)
+EXTRA_DIST += \
+       $(installed_m4) \
+       gettext.m4      \
+       iconv.m4        \
+       lib-ld.m4       \
+       lib-link.m4     \
+       lib-prefix.m4   \
+       nls.m4          \
+       po.m4           \
+       progtest.m4
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = $(installed_m4)
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..1df6c98
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,89 @@
+# 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_ \
+       --keyword=C_:1c,2 \
+       --keyword=NC_:1c,2 \
+       --keyword=g_dcgettext:2 \
+       --keyword=g_dngettext:2,3 \
+       --keyword=g_dpgettext2:2c,3 \
+       --flag=N_:1:pass-c-format \
+       --flag=C_:2:pass-c-format \
+       --flag=NC_:2:pass-c-format \
+       --flag=g_dngettext:2:pass-c-format \
+       --flag=g_strdup_printf:1:c-format \
+       --flag=g_string_printf:2:c-format \
+       --flag=g_string_append_printf:2:c-format \
+       --flag=g_error_new:3:c-format \
+       --flag=g_set_error:4:c-format \
+       --flag=g_markup_printf_escaped:1:c-format \
+       --flag=g_log:3:c-format \
+       --flag=g_print:1:c-format \
+       --flag=g_printerr:1:c-format \
+       --flag=g_printf:1:c-format \
+       --flag=g_fprintf:2:c-format \
+       --flag=g_sprintf:2:c-format \
+       --flag=g_snprintf:3:c-format \
+       --flag=g_scanner_error:2:c-format \
+       --flag=g_scanner_warn:2:c-format
+
+# 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 = Free Software Foundation, Inc.
+
+# 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 = yes
+
+# 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 =
+
+# 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