[geocode-glib] Use upstream gettext instead intltool

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

commit fbdd8d425ad41ec90b301e4bcf14c7baaeb500e7
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Sep 17 16:32:45 2013 +0100

    Use upstream gettext instead intltool
    
    So we have an updated and well maintained po/Makefile.in.in

 configure.ac                   |    4 +-
 geocode-glib/Makefile.am       |    6 ++++-
 geocode-glib/geocode-reverse.c |    2 +-
 po/Makevars                    |   41 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4532b50..1d3a6e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,13 +45,13 @@ LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
 # i18n support
-IT_PROG_INTLTOOL([0.41.0])
+AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=geocode-glib
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                                        [The name of the gettext domain])
-AM_GLIB_DEFINE_LOCALEDIR(GEOCODE_GLIB_LOCALEDIR)
 
 dnl gtk-doc checks
 GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
diff --git a/geocode-glib/Makefile.am b/geocode-glib/Makefile.am
index 3eb7c54..c4ededb 100644
--- a/geocode-glib/Makefile.am
+++ b/geocode-glib/Makefile.am
@@ -40,7 +40,11 @@ gcglib_HEADERS =                                     \
        $(GCGLIB_HEADER_FILES)                          \
        geocode-enum-types.h
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -DTEST_SRCDIR=\""$(srcdir)/data/"\"
+AM_CPPFLAGS =                                          \
+       -I$(top_srcdir)                                 \
+       -I$(top_builddir)                               \
+       -DTEST_SRCDIR=\""$(srcdir)/data/"\"             \
+       -DGEOCODE_LOCALEDIR=\"$(localedir)\"
 
 AM_CFLAGS = $(GEOCODE_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
diff --git a/geocode-glib/geocode-reverse.c b/geocode-glib/geocode-reverse.c
index 9f4b5a3..71917bd 100644
--- a/geocode-glib/geocode-reverse.c
+++ b/geocode-glib/geocode-reverse.c
@@ -65,7 +65,7 @@ geocode_reverse_class_init (GeocodeReverseClass *klass)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-        bindtextdomain (GETTEXT_PACKAGE, GEOCODE_GLIB_LOCALEDIR);
+        bindtextdomain (GETTEXT_PACKAGE, GEOCODE_LOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
        gobject_class->finalize = geocode_reverse_finalize;
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..6442d70
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# 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_ --from-code=UTF-8
+
+# 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 =