Revert "go back to allowing gettext 0.11.5, but don't mix with libtool 2.2"

This reverts commit 31c09d738ce7f47bff9d292996e9489c275e55a1.

Reverting this, since it breaks autogen.sh for me on debian sid.
Failure is: "libtool 2.2 requires autopoint 0.17 or higher" even though
0.17 was found.

diff --git a/autogen.sh b/autogen.sh
index feeaa3c..266a808 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,7 +42,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" "" \
@@ -53,7 +53,6 @@ die_check $DIE
 autoconf_2_52d_check || DIE=1
 aclocal_check || DIE=1
 autoheader_check || DIE=1
-libtool_2_2_gettext_check || DIE=1
 
 die_check $DIE
 

diff --git a/common b/common
index 22cfb47..c572721 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 22cfb47cf8add0ffb07c12181f32bf2e33c393e5
+Subproject commit c57272152d5c40617fab305d839db1b1fefe0ea0

diff --git a/configure.ac b/configure.ac
index fbe7f61..9a6bec2 100644 (file)
--- 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])