Require gettext 0.17 because older versions don't mix with libtool 2.2. At build...

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.

diff --git a/ChangeLog b/ChangeLog
index 929473cbd4b45b87e18dbba2d7d2de6a21c4000f..7ebe42ea711acaf664165ce07d877a6b6cb71bba 100644 (file)
--- 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 0ce10a0d9129b13ab13724c64aa26483a68ecba8..b9ca939900ac65b2b30390e5b169e7570e4d24f0 100755 (executable)
--- 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 e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1ef..03699ffc577ee8a42541862f11a6d0d0dff34f41 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1ef
+Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41

diff --git a/configure.ac b/configure.ac
index 6ed0ea88bf60add89c9e54b054b1b3bcd81a429c..a28c2247e566060bc75f942152c4bfc911cf0678 100644 (file)
--- 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])