Commit bddac5f5 authored by Edward Wang's avatar Edward Wang Committed by 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: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent c31a26db
--- 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])
...@@ -23,6 +23,7 @@ ifdef HAVE_ANDROID ...@@ -23,6 +23,7 @@ ifdef HAVE_ANDROID
endif endif
$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
$(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch
$(call pkg_static,"lib/gnutls.pc.in") $(call pkg_static,"lib/gnutls.pc.in")
$(UPDATE_AUTOCONFIG) $(UPDATE_AUTOCONFIG)
$(MOVE) $(MOVE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment