[PATCH 1/4] adapt pkg-config file for switch from AM_PATH_LIBGCRYPT to AC_LIB_HAVE_LI...

[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.

diff --git a/lib/configure.ac b/lib/configure.ac
index f6793bb42b305beb98713924a44396ddb5884fce..1f667734e8e667382ae057bf3b21e84c1108d94f 100644 (file)
--- 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 5898ca1a725b9e1b7aa695cacfaad0b49803143c..3e71f9e84e63823b3b7d246a1f9f6d0e1334b4b4 100644 (file)
--- 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@
+@GNUTLS_REQUIRES_PRIVATE@
 Cflags: -I${includedir}

diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index f7d84f0f611215a6cc1cd5a898b87bbcd5c364ad..42e45574b0ffd535c38b031be0028673233834cb 100644 (file)
--- 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,