diff options
| author | Andreas Metzler <ametzler@downhill.at.eu.org> | 2010-02-28 13:16:37 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-02-05 10:20:33 +0100 |
| commit | 54fa9be2f0e9f7044b21aa21d21532759586c92f (patch) | |
| tree | 325019efdbfba1fe4c60cf8b6223d802a3b6e956 | |
| parent | 7936f686349e4adcc7c11f15b9a060f9ec6b1123 (diff) | |
| download | gnutls-54fa9be2f0e9f7044b21aa21d21532759586c92f.tar.gz | |
pkg-config: If gnutls is built with zlib support list zlib in Requires.private.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | lib/configure.ac | 9 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/configure.ac b/lib/configure.ac index b3c59bda3e..6b734c2725 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 9c562a60cf..19a9b67fd9 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, |