[vlc-commits] contrib: lame: use a more newer version of autotools

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 25 08:45:41 2018 +0200| [7ec6b158453c3078f5e1e878d6d12cbc623b8b11] | committer: Jean-Baptiste Kempf

contrib: lame: use a more newer version of autotools

the ansi2knr automake options produces an error in newer versions, so we disable it

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

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

 contrib/src/lame/lame-outdated-autotools.patch | 50 ++++++++++++++++++++++++++
 contrib/src/lame/rules.mak                     |  2 ++
 2 files changed, 52 insertions(+)

diff --git a/contrib/src/lame/lame-outdated-autotools.patch b/contrib/src/lame/lame-outdated-autotools.patch
new file mode 100644
index 0000000000..4bc27922f9
--- /dev/null
+++ b/contrib/src/lame/lame-outdated-autotools.patch
@@ -0,0 +1,50 @@
+--- lame/configure.in.autotools	2012-02-28 19:50:27.000000000 +0100
++++ lame/configure.in	2018-05-24 08:17:53.119940000 +0200
+@@ -78,7 +78,7 @@ if test "${GCC}" = "yes"; then
+ fi
+ 
+ dnl more automake stuff
+-AM_C_PROTOTYPES
++dnl AM_C_PROTOTYPES
+ 
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+@@ -393,7 +393,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"
+ 
+ dnl configure use of features
+ 
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
+ 
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
+--- lame/doc/html/Makefile.am.autotools	2018-05-24 08:42:16.439442600 +0200
++++ lame/doc/html/Makefile.am	2018-05-24 08:19:44.596125100 +0200
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
+--- lame/doc/man/Makefile.am.autotools	2018-05-24 08:42:11.199809700 +0200
++++ lame/doc/man/Makefile.am	2018-05-24 08:19:48.855510100 +0200
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
+--- lame/libmp3lame/i386/Makefile.am.autotools	2018-05-24 08:42:07.015600500 +0200
++++ lame/libmp3lame/i386/Makefile.am	2018-05-24 08:19:54.559671800 +0200
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
diff --git a/contrib/src/lame/rules.mak b/contrib/src/lame/rules.mak
index 02b9d44348..e49a9d714f 100644
--- a/contrib/src/lame/rules.mak
+++ b/contrib/src/lame/rules.mak
@@ -12,10 +12,12 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame
 	$(UNPACK)
 	$(APPLY) $(SRC)/lame/lame-forceinline.patch
 	$(APPLY) $(SRC)/lame/sse.patch
+	$(APPLY) $(SRC)/lame/lame-outdated-autotools.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .lame: lame
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-analyzer-hooks --disable-decoder --disable-gtktest --disable-frontend
 	cd $< && $(MAKE) install
 	touch $@