[vlc-commits] contrib: lame: Avoid the dependency on gettext

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Sun May 27 00:12:15 2018 +0300| [6ac538121ee1d8599e8fce980332666f1fe6ab9b] | committer: Jean-Baptiste Kempf

contrib: lame: Avoid the dependency on gettext

Modify configure.in before reconfiguring, to avoid requiring the
dependency on gettext.

(cherry picked from commit 8d0093e71e6297ae6a60c3170e80d0d722f5be5e)
(cherry picked from commit f942eac0d25cb6921324ffa1b3c7d7436a27cf5f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6ac538121ee1d8599e8fce980332666f1fe6ab9b
---

 contrib/src/lame/rules.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/lame/rules.mak b/contrib/src/lame/rules.mak
index e49a9d714f..45186e2505 100644
--- a/contrib/src/lame/rules.mak
+++ b/contrib/src/lame/rules.mak
@@ -13,6 +13,9 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame
 	$(APPLY) $(SRC)/lame/lame-forceinline.patch
 	$(APPLY) $(SRC)/lame/sse.patch
 	$(APPLY) $(SRC)/lame/lame-outdated-autotools.patch
+	# Avoid relying on iconv.m4 from gettext, when reconfiguring.
+	# This is only used by the frontend which we disable.
+	cd $(UNPACK_DIR) && sed -i.orig 's/^AM_ICONV/#&/' configure.in
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)