From: Sebastian Dröge Date: Sat, 29 Nov 2008 13:29:14 +0000 (+0000) Subject: Require gettext 0.17 because older versions don't mix with libtool 2.2. At build... X-Git-Tag: GIT_CONVERSION~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c159bda3a383d240a38e7edc570c83ba17e9bf2b;p=platform%2Fupstream%2Fgstreamer.git 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 * 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 e4822ae..0d94b45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-11-29 Sebastian Dröge + + Patch by: Cygwin Ports maintainer + + + * 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-27 Wim Taymans Patch by: 이문형 diff --git a/autogen.sh b/autogen.sh index e6efc42..3749bf7 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.8 automake18 automake-1.7 automake17 automake-1.6 automake16" \ "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 libtoolize15 glibtoolize" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ diff --git a/common b/common index e4b2fe4..03699ff 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1ef +Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41 diff --git a/configure.ac b/configure.ac index 530be44..1378640 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-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([gstreamer-$GST_MAJORMINOR])