generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added 'Requires:' line to libssh2.pc.

Browse Source 
This is necessary so that other libs which lookup libssh2 info
via pkg-config can add the right crypto lib dependencies.
This commit is contained in:
Guenter Knauf
2012-04-23 00:35:03 +02:00
parent a955f8428b
commit 04692445d4
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -96,13 +96,17 @@ AC_ARG_WITH(libz,
# Look for OpenSSL (default) # Look for OpenSSL (default)
if test "$use_openssl" != "no" && test "$use_libgcrypt" != "yes"; then if test "$use_openssl" != "no" && test "$use_libgcrypt" != "yes"; then
AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [#include <openssl/ssl.h>]) AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [#include <openssl/ssl.h>])
LIBSREQUIRED=ssl,crypto
fi fi
# Look for libgcrypt # Look for libgcrypt
if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
LIBSREQUIRED=gcrypt
fi fi
AC_SUBST(LIBSREQUIRED)
if test "$ac_cv_libssl" != "yes" && test "$ac_cv_libgcrypt" != "yes"; then if test "$ac_cv_libssl" != "yes" && test "$ac_cv_libgcrypt" != "yes"; then
AC_MSG_ERROR([cannot find OpenSSL or Libgcrypt, AC_MSG_ERROR([cannot find OpenSSL or Libgcrypt,
try --with-libssl-prefix=PATH or --with-libgcrypt-prefix=PATH]) try --with-libssl-prefix=PATH or --with-libgcrypt-prefix=PATH])

1
libssh2.pc.in
View File

@@ -11,6 +11,7 @@ Name: libssh2
URL: http://www.libssh2.org/ URL: http://www.libssh2.org/
Description: Library for SSH-based communication Description: Library for SSH-based communication
Version: @LIBSSH2VER@ Version: @LIBSSH2VER@
Requires: @LIBSREQUIRED@
Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@ Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
Libs.private: @LIBS@ Libs.private: @LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}