[vlc-commits] gnutls: more generic way to force the available API entries

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Mon Feb  8 17:34:09 2016 +0100| [5eb7edff253f9f41082ee36b6cafb5a5413ea822] | committer: Jean-Baptiste Kempf

gnutls: more generic way to force the available API entries

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

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

 contrib/src/gnutls/rules.mak |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index cd8626d..ef0818c 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -51,15 +51,17 @@ GNUTLS_CONF := \
 	--disable-tests \
 	$(HOSTCONF)
 
+GNUTLS_ENV := $(HOSTVARS)
+
 DEPS_gnutls = nettle $(DEPS_nettle)
 
-.gnutls: gnutls
-	$(RECONF)
 ifdef HAVE_ANDROID
-	cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
-else
-	cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
+GNUTLS_ENV += gl_cv_header_working_stdint_h=yes
 endif
+
+.gnutls: gnutls
+	$(RECONF)
+	cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)
 	cd $</gl && $(MAKE) install
 	cd $</lib && $(MAKE) install
 	touch $@