diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-07-27 16:03:50 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-07-27 16:03:50 +0200 |
| commit | 1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e (patch) | |
| tree | 816870967ec00848a916fd1dae073457a8fc0141 | |
| parent | 75e1848168063a8d207a9d1a49342970313178de (diff) | |
| download | gnutls-1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e.tar.gz | |
only add zlib.pc if found. Corrected libs.private in nettle case.
| -rw-r--r-- | lib/configure.ac | 13 | ||||
| -rw-r--r-- | lib/gnutls.pc.in | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/configure.ac b/lib/configure.ac index b3cd78ccdb..e9813d7f19 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -80,14 +80,21 @@ else AC_MSG_RESULT(no) fi +PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) + if test x$ac_zlib != xno; then - if test x$GNUTLS_REQUIRES_PRIVATE = x; then - GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" + if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then + if test x$GNUTLS_REQUIRES_PRIVATE = x; then + GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" + else + GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib" + fi else - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib" + GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ" fi fi AC_SUBST(GNUTLS_REQUIRES_PRIVATE) +AC_SUBST(GNUTLS_ZLIB_LIBS_PRIVATE) lgl_INIT diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index 2d3328c1a3..bac5f424c7 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnu.org/software/gnutls/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ +Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} |