summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-12-20 19:03:25 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-12-26 15:30:27 +0100
commit96cd562d12d06d1f1e63e7e862ddc50d9abfaf6a (patch)
tree1ee91924ae946bbfa8bb22d8aa33badf2e458112
parent2c758f42a8430cb0b0b1d0769b1baca5e09fcd4a (diff)
downloadptxdist-96cd562d12d06d1f1e63e7e862ddc50d9abfaf6a.tar.gz
ptxdist-96cd562d12d06d1f1e63e7e862ddc50d9abfaf6a.tar.xz
[libcurl] enable libssh2 support in makefile
libssh2 is enabled in the .in file since 7ec5e0fcbe19839c34a7d012174cd4752d8c8d6c, but the .make file support was lacking. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Cherry-picked from master: b2a299fbe2301bbb18dc2d31192280177c5e1c2c Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--rules/libcurl.make7
1 files changed, 6 insertions, 1 deletions
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 52788e4ab..acfb0b15e 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -66,7 +66,6 @@ LIBCURL_AUTOCONF := \
--without-krb4 \
--without-spnego \
--without-gssapi \
- --without-libssh2 \
--without-gnutls \
--without-nss \
--without-ca-bundle \
@@ -109,6 +108,12 @@ else
LIBCURL_AUTOCONF += --disable-crypto-auth
endif
+ifdef PTXCONF_LIBCURL_LIBSSH2
+LIBCURL_AUTOCONF += --with-libssh2
+else
+LIBCURL_AUTOCONF += --without-libssh2
+endif
+
ifdef PTXCONF_LIBCURL_IPV6
LIBCURL_AUTOCONF += --enable-ipv6
else