[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_7_a-7-g1b90f50

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e

The branch, gnutls_2_12_x has been updated
       via  1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e (commit)
      from  75e1848168063a8d207a9d1a49342970313178de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 27 16:03:50 2011 +0200

    only add zlib.pc if found. Corrected libs.private in nettle case.

-----------------------------------------------------------------------

Summary of changes:
 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..bac5f42 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}


hooks/post-receive
-- 
GNU gnutls