>From bfa3c1c5f7855ecc051587fce8cc4c085a3ba4ec Mon Sep 17 00:00:00 2001
From: Andreas Metzler <address@hidden>
Date: Sun, 28 Feb 2010 13:16:37 +0100
Subject: [PATCH 4/4] pkg-config: If gnutls is built with zlib support list zlib in Requires.private.

---
 lib/configure.ac |    9 +++++++++
 lib/m4/hooks.m4  |    1 -
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index 01178b7..837c4d0 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -79,6 +79,15 @@ else
  AC_MSG_RESULT(no)
 fi
 
+if test x$ac_zlib != xno; then
+  if test x$GNUTLS_REQUIRES_PRIVATE = x; then
+    GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
+  else
+    GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
+  fi
+fi
+AC_SUBST(GNUTLS_REQUIRES_PRIVATE)
+
 lgl_INIT
 
 LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 779f208..698da34 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -65,7 +65,6 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes")
   if test "$included_libtasn1" = "no"; then
     GNUTLS_REQUIRES_PRIVATE="Requires.private: libtasn1"
-    AC_SUBST(GNUTLS_REQUIRES_PRIVATE)
   fi
 
   AC_ARG_WITH(lzo,
-- 
1.6.5