gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 44/163: configure: fix ssh2 linking when built with


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 44/163: configure: fix ssh2 linking when built with a static mbedtls
Date: Sun, 05 Aug 2018 12:36:10 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 536e9f828997c39d67fcf09cb3b2c19d4cf216cc
Author: Fabrice Fontaine <address@hidden>
AuthorDate: Mon May 21 12:07:00 2018 +0200

    configure: fix ssh2 linking when built with a static mbedtls
    
    The ssh2 pkg-config file could contain the following lines when build
    with a static version of mbedtls:
       Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
       Libs.private: /xxx/libmbedcrypto.a
    
    This static mbedtls library must be used to correctly detect ssh2
    support and this library must be copied in libcurl.pc otherwise
    compilation of any application (such as upmpdcli) with libcurl will fail
    when trying to found mbedtls functions included in libssh2.  So, replace
    pkg-config --libs-only-l by pkg-config --libs.
    
    Fixes:
     - 
http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a
    
    Signed-off-by: Fabrice Fontaine <address@hidden>
    Closes #2613
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c552c46ab..69a185044 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2768,7 +2768,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
     CURL_CHECK_PKGCONFIG(libssh2)
 
     if test "$PKGCONFIG" != "no" ; then
-      LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2`
+      LIB_SSH2=`$PKGCONFIG --libs libssh2`
       LD_SSH2=`$PKGCONFIG --libs-only-L libssh2`
       CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2`
       version=`$PKGCONFIG --modversion libssh2`

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]