www.libssh2.org | Daily snapshots | Mailing list archive | Docs | Examples | github

Archive Index This month's Index

Subject: [PATCH] acinclude.m4: The mbedtls crypto backend actually requires libmbedcrypto

[PATCH] acinclude.m4: The mbedtls crypto backend actually requires libmbedcrypto

From: Peter Stuge <peter_at_stuge.se>
Date: Wed, 16 Nov 2016 22:44:23 +0100

Examples can't be linked with libmbedtls but need libmbedcrypto, and
any users of libssh2 which use libtool and libssh2.la would encounter
the same problem.

This changes the mbedtls detection to search for libmbedcrypto, which
is the actual dependency for the backend.

---
 Makefile.mbedTLS.inc | 2 +-
 acinclude.m4         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.mbedTLS.inc b/Makefile.mbedTLS.inc
index c22e51a..b9f19fc 100644
--- a/Makefile.mbedTLS.inc
+++ b/Makefile.mbedTLS.inc
@@ -1,3 +1,3 @@
 CRYPTO_CSOURCES = mbedtls.c
 CRYPTO_HHEADERS = mbedtls.h
-CRYPTO_LTLIBS = $(LTLIBMBEDTLS)
+CRYPTO_LTLIBS = $(LTLIBMBEDCRYPTO)
diff --git a/acinclude.m4 b/acinclude.m4
index 8a2ea6d..c0e89a1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -439,7 +439,7 @@ m4_case([$1],
 ],
 
 [mbedtls], [
-  LIBSSH2_LIB_HAVE_LINKFLAGS([mbedtls], [], [#include <mbedtls/version.h>], [
+  LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include <mbedtls/version.h>], [
     AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1])
     found_crypto="$1"
     support_clear_memory=yes
-- 
_______________________________________________
libssh2-devel https://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel
Received on 2016-11-16

the libssh2 team