[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-84-gb74bb9e

[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=b74bb9eaafcc7835c4b9803278f23aac4c0519fa

The branch, master has been updated
       via  b74bb9eaafcc7835c4b9803278f23aac4c0519fa (commit)
      from  962013fa4b5c1da7a39e5249e146e80f8ca6a7ed (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 b74bb9eaafcc7835c4b9803278f23aac4c0519fa
Author: Andreas Metzler <address@hidden>
Date:   Sat Feb 5 10:18:25 2011 +0100

    [PATCH 1/4] adapt pkg-config file for switch from AM_PATH_LIBGCRYPT to 
AC_LIB_HAVE_LINKFLAGS
    [PATCH 2/4] pkg-config: Move libtasn1 from Libs.private to Requires.private 
since libtasn1 provides a .pc file.
    [PATCH 3/4] pkg-config: drop @LIBGNUTLS_LIBS@ from Libs.private. This 
library only contains gnutls itself nowadays, which is in Libs already.
    [PATCH 4/4] pkg-config: If gnutls is built with zlib support list zlib in 
Requires.private.

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

Summary of changes:
 lib/configure.ac |    9 +++++++++
 lib/gnutls.pc.in |    3 ++-
 lib/m4/hooks.m4  |    4 ++++
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index f6793bb..1f66773 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -80,6 +80,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
 
 AC_CHECK_FUNCS(getrusage,,)
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 5898ca1..3e71f9e 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -20,5 +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: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ @LTLIBPAKCHOIS@
+Libs.private: @LTLIBPAKCHOIS@ @LTLIBGCRYPT@
address@hidden@
 Cflags: -I${includedir}
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index f7d84f0..42e4557 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -94,6 +94,10 @@ fi
   AC_MSG_RESULT($included_libtasn1)
   AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes")
 
+  if test "$included_libtasn1" = "no"; then
+    GNUTLS_REQUIRES_PRIVATE="Requires.private: libtasn1"
+  fi
+
   AC_ARG_WITH(included-pakchois,
     AS_HELP_STRING([--with-included-pakchois], [use the included pakchois]),
       included_pakchois=$withval,


hooks/post-receive
-- 
GNU gnutls