>From 5f4e31ae9557e949aef006b65616fb8a30493dca Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Fri, 24 Jun 2011 17:56:38 +0200 Subject: [PATCH] fix zlib handling in gnutls.pc Only add zlib to gnutls.pc's Requies.private if zlib ships a pkg-config file. Ancient (<< 1.2.3.1) versions don't. Otherwise add -lz to Libs.private. --- lib/configure.ac | 13 ++++++++++--- lib/gnutls.pc.in | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/configure.ac b/lib/configure.ac index b3cd78c..e9813d7 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 2d3328c..47bfa5a 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@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- 1.7.2.5