[vlc-commits] contrib: ssh2: explicitely depend on gcrypt

Rafaël Carré git at videolan.org
Thu Feb 12 22:09:27 CET 2015


vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Feb 12 21:58:32 2015 +0100| [49dd9218550c7be1037856f675702b23a333749d] | committer: Jean-Baptiste Kempf

contrib: ssh2: explicitely depend on gcrypt

OpenSSL is the default if both exist

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

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

 contrib/src/ssh2/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak
index 323b465..ff9be2b 100644
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -24,6 +24,6 @@ DEPS_ssh2 = gcrypt $(DEPS_gcrypt)
 
 .ssh2: ssh2
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples-build
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples-build --with-libgcrypt --without-openssl
 	cd $< && $(MAKE) install
 	touch $@



More information about the vlc-commits mailing list