summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-11-29 13:31:47 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-11-29 13:31:47 +0000
commit97b2cac6c8397b14264c1e34be4dc6ce353a62df (patch)
treee4361c90bede884881bc39e6faabafa40703200b
parent1048c62b2c4f400888728ef16883b985dcec33b5 (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 3cd68bcf..ab60ed78 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 Christian Schaller <christian.schaller@collabora.co.uk>
* gst/speexresample/Makefile.am: fix build by removing -lgstaudio
diff --git a/autogen.sh b/autogen.sh
index 43cda4e7..6d12946a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.
version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 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 c02ebd23..4163ad3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,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-base-$GST_MAJORMINOR])