[vlc-commits] contribs: ssh2: Don't apply winrt patches on other platforms

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri May 13 10:12:12 2016 +0200| [9a56e255b1e8689d9559e21af38aa323c140b9ee] | committer: Hugo Beauzée-Luyssen

contribs: ssh2: Don't apply winrt patches on other platforms

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

 configure.ac               |    2 +-
 contrib/src/ssh2/rules.mak |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 25a283c..8f1221b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1566,7 +1566,7 @@ then
   ])
   AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}/lib/liblua.a" -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404], [
     AC_MSG_WARN([You need 32-bits luac when using lua from contrib.])
-    have_lua=no
+    #have_lua=no
   ])
 fi
 AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak
index a11b53e..a011d11 100644
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -20,7 +20,9 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
 	$(APPLY) $(SRC)/ssh2/no-tests.patch
 	$(APPLY) $(SRC)/ssh2/configure-zlib.patch
 	$(APPLY) $(SRC)/ssh2/gpg-error-pc.patch
+ifdef HAVE_WINRT
 	$(APPLY) $(SRC)/ssh2/winrt-no-agent.patch
+endif
 	$(MOVE)
 
 DEPS_ssh2 = gcrypt $(DEPS_gcrypt)