fd953af246
- Bump version to 1.8.0 - Switch from openssl crypto backend to mbedtls (the package is a lot smaller size-wise compared to openssl and libgcrypt) - mbedtls support was added in 1.8.0 release. Unfortunately the detection doesn't work out of the box, so a patch is needed that fixes an m4 script. For that reason autoreconf must be run. - Add --with-libz-prefix as without it zlib is not detected (currently there is the zlib dependency but libssh2 never actually links to it). - Add --disable-silent-rules to get verbose build output. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -386,9 +386,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [
|
|
|
|
old_LDFLAGS=$LDFLAGS
|
|
old_CFLAGS=$CFLAGS
|
|
- if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then
|
|
- LDFLAGS="$LDFLAGS -L$use_mbedtls/lib"
|
|
- CFLAGS="$CFLAGS -I$use_mbedtls/include"
|
|
+ if test -n "$with_libmbedtls_prefix" && test "$use_mbedtls" != "no"; then
|
|
+ LDFLAGS="$LDFLAGS -L$with_libmbedtls_prefix/lib"
|
|
+ CFLAGS="$CFLAGS -I$with_libmbedtls_prefix/include"
|
|
fi
|
|
|
|
AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [
|
|
@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
|
|
|
|
old_LDFLAGS=$LDFLAGS
|
|
old_CFLAGS=$CFLAGS
|
|
- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
|
|
- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
|
|
- CFLAGS="$CFLAGS -I$use_libgcrypt/include"
|
|
+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
|
|
+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
|
|
+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
|
|
fi
|
|
AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
|
|
#include <gcrypt.h>
|