summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-03-03 17:31:30 -0500
committerMatthias Clasen <mclasen@redhat.com>2015-03-03 17:32:25 -0500
commita33af7c4eb0bb910f6a209fd84a7ce5d07552239 (patch)
tree79edfce4964a8ccaf42d667bb79bc2bf29adbae3
parent6e0784f46686207daa3e5567f454a264faccbb23 (diff)
downloadgdk-pixbuf-a33af7c4eb0bb910f6a209fd84a7ce5d07552239.tar.gz
Revert "Remove gross gettext pot file hack"
This reverts commit b7dff89390601b8607da192a07dcf16bb517745e. build.gnome.org doesn't yet have a new-enough gettext for this.
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac2
-rw-r--r--po/Makevars11
3 files changed, 5 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh
index 4a373e9b9..9ec09e5bb 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/gdk-pixbuf.pot
+
GTKDOCIZE=`which gtkdocize`
if test -z $GTKDOCIZE; then
echo "*** No GTK-Doc found, please install it ***"
diff --git a/configure.ac b/configure.ac
index b4734b37c..2b64adfbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,7 +339,7 @@ if test "$gtk_ok" = "yes"; then
fi
# i18n stuff
-AM_GNU_GETTEXT_VERSION([0.19])
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE="$PACKAGE"
diff --git a/po/Makevars b/po/Makevars
index e437d44ea..9b3e36809 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -56,14 +56,3 @@ 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 =
-
-# Ignore the timestamp of the .pot file, as git clones do not have
-# deterministic timestamps, and .po files are updated by translators
-# (only) in GNOME projects.
-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