[vlc-commits] contrib: gnutls: downgrade automake requirement

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Tue Mar 26 00:02:30 2013 -0400| [bddac5f5c67d27f97c0f29fbcdfd5aa36d77fe20] | committer: Jean-Baptiste Kempf

contrib: gnutls: downgrade automake requirement

Tested and working with automake 1.11.1, builds and works fine. Confirmed by another project as well: https://github.com/mxe/mxe/issues/128

Also removed dist-lzip because of "configure.ac:29: option `dist-lzip' not recognized"

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gnutls/downgrade-automake-requirement.patch |   11 +++++++++++
 contrib/src/gnutls/rules.mak                            |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/gnutls/downgrade-automake-requirement.patch b/contrib/src/gnutls/downgrade-automake-requirement.patch
new file mode 100644
index 0000000..1cbd566
--- /dev/null
+++ b/contrib/src/gnutls/downgrade-automake-requirement.patch
@@ -0,0 +1,11 @@
+--- gnutls/configure.ac.orig	2013-03-25 22:24:57.224241327 -0400
++++ gnutls/configure.ac	2013-03-25 22:25:10.930919097 -0400
+@@ -26,7 +26,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_HOST
+ 
+-AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
++AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_CONFIG_HEADERS([config.h])
+ 
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 07b2b2d..847b71f 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -23,6 +23,7 @@ ifdef HAVE_ANDROID
 endif
 	$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
 	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
+	$(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch
 	$(call pkg_static,"lib/gnutls.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)