[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_10_4-6-g54fa9be

[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=54fa9be2f0e9f7044b21aa21d21532759586c92f

The branch, gnutls_2_10_x has been updated
       via  54fa9be2f0e9f7044b21aa21d21532759586c92f (commit)
       via  7936f686349e4adcc7c11f15b9a060f9ec6b1123 (commit)
       via  86cd374ca33a6721c8b85982f02349094b370df8 (commit)
       via  84c26034a63a6cb4b3283a4ff682a13c8f455bc6 (commit)
      from  c5a45a67b4b876db8aede710ab60567436df2b51 (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 54fa9be2f0e9f7044b21aa21d21532759586c92f
Author: Andreas Metzler <address@hidden>
Date:   Sun Feb 28 13:16:37 2010 +0100

    pkg-config: If gnutls is built with zlib support list zlib in 
Requires.private.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 7936f686349e4adcc7c11f15b9a060f9ec6b1123
Author: Andreas Metzler <address@hidden>
Date:   Sun Feb 28 11:30:09 2010 +0100

    pkg-config: drop @LIBGNUTLS_LIBS@ from Libs.private. This library only 
contains gnutls itself nowadays, which is in Libs already.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 86cd374ca33a6721c8b85982f02349094b370df8
Author: Andreas Metzler <address@hidden>
Date:   Sun Feb 28 11:15:54 2010 +0100

    pkg-config: Move libtasn1 from Libs.private to Requires.private since 
libtasn1 provides a .pc file.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 84c26034a63a6cb4b3283a4ff682a13c8f455bc6
Author: Andreas Metzler <address@hidden>
Date:   Sun Feb 28 10:40:02 2010 +0100

    adapt pkg-config file for switch from AM_PATH_LIBGCRYPT to 
AC_LIB_HAVE_LINKFLAGS
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

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

diff --git a/lib/configure.ac b/lib/configure.ac
index b3c59bd..6b734c2 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/gnutls.pc.in b/lib/gnutls.pc.in
index a4a3495..5fb4251 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@
+Libs.private: @LTLIBGCRYPT@
address@hidden@
 Cflags: -I${includedir}
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 648fbcc..19a9b67 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -63,6 +63,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_MSG_CHECKING([whether to use the included minitasn1])
   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(lzo,
     AS_HELP_STRING([--with-lzo], [use experimental LZO compression]),


hooks/post-receive
-- 
GNU gnutls