summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-11-29 13:31:55 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-11-29 13:31:55 +0000
commit2cb242b814dc79a80f8ba85198ba611a827c930d (patch)
treead1fff5a7ac4f17b39ba4747702ccd38cc433531
parent3db0832748b7e2ba4d47ec2436f1d78d2b7ed1e1 (diff)
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.
-rw-r--r--ChangeLog11
-rwxr-xr-xautogen.sh2
m---------common0
-rw-r--r--configure.ac2
4 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac2976c..ffdc05e1 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-28 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Peter Kjellerstedt <pkj at axis com>
diff --git a/autogen.sh b/autogen.sh
index fad082b3..4de1c88b 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
-Subproject e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1e
+Subproject 03699ffc577ee8a42541862f11a6d0d0dff34f4
diff --git a/configure.ac b/configure.ac
index 23be57a6..c7e0c9a0 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-good-$GST_MAJORMINOR])