[glib] Use upstream gettext instead the glib one

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

commit e930e3b3aac2fe4d62996d8033121a40153f2da3
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon May 16 13:23:47 2011 +0100

    Use upstream gettext instead the glib one

 autogen.sh        |    4 +
 configure.ac      |   15 +---
 gio/Makefile.am   |    1 +
 glib/Makefile.am  |    1 +
 po/Makefile.in.in |  280 -----------------------------------------------------
 po/Makevars       |   66 +++++++++++++
 6 files changed, 74 insertions(+), 293 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 892b57b..eed59f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,10 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+# GNU gettext automake support doesn't get along with git.
+# https://bugzilla.gnome.org/show_bug.cgi?id=661128
+touch -t 200001010000 po/glib.pot
+
 GTKDOCIZE=$(which gtkdocize 2>/dev/null)
 if test -z $GTKDOCIZE; then
         echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
diff --git a/configure.ac b/configure.ac
index f300fa0..26ee1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,17 +476,8 @@ AC_SUBST(LIBFFI_LIBS)
 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.18.1])
+AM_GNU_GETTEXT([external])
 
 LIBS="$INTLLIBS $LIBS"
 
@@ -495,8 +486,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 20bcd81..c4cf9d6 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -35,6 +35,7 @@ endif
 
 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 65142f2..277faf9 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -45,6 +45,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/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..7815930
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,66 @@
+# 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 =