From bc794219f3f93dd63f2905a472b26d5c1fc0faea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Sat, 29 Nov 2008 13:33:37 +0000
Subject: [PATCH] Require gettext 0.17 because older versions don't mix with
 libtool 2.2. At build time an older gettext version will s...

Original commit message from CVS:
Patch by: Cygwin Ports maintainer
<yselkowitz at users dot sourceforge dot net>
* autogen.sh:
* configure.ac:
Require gettext 0.17 because older versions don't mix with libtool
2.2. At build time an older gettext version will still work.
Fixes bug #556091.
---
 ChangeLog    | 11 +++++++++++
 autogen.sh   |  2 +-
 common       |  2 +-
 configure.ac |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 929473cbd4..7ebe42ea71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-29  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Cygwin Ports maintainer
+	          <yselkowitz at users dot sourceforge dot net>
+
+	* autogen.sh:
+	* configure.ac:
+	Require gettext 0.17 because older versions don't mix with libtool
+	2.2. At build time an older gettext version will still work.
+	Fixes bug #556091.
+
 2008-11-24  David Schleef  <ds@schleef.org>
 
 	* ext/mpeg2dec/gstmpeg2dec.c:
diff --git a/autogen.sh b/autogen.sh
index 0ce10a0d91..b9ca939900 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon
 version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.7 automake-1.6 automake-1.5" \
               "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
 version_check "autopoint" "autopoint" \
-              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
+              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
               "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
 version_check "pkg-config" "" \
diff --git a/common b/common
index e4b2fe4472..03699ffc57 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1ef
+Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41
diff --git a/configure.ac b/configure.ac
index 6ed0ea88bf..a28c2247e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
 
 dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.17)
 AM_GNU_GETTEXT([external])
 AG_GST_GETTEXT([gst-plugins-ugly-$GST_MAJORMINOR])