From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Fri, 24 Jun 2011 15:56:38 +0000 (+0200)
Subject: fix zlib handling in gnutls.pc
X-Git-Tag: gnutls_3_0_0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c79f80768310baab38496255d349e722aa173c8;p=thirdparty%2Fgnutls.git

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.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/configure.ac b/configure.ac
index a03421ffa6..d2326348c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,14 +186,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)
 
 
 gl_INIT