diff options
| author | Andreas Metzler <ametzler@downhill.at.eu.org> | 2011-06-24 17:56:38 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-07-27 15:59:28 +0200 |
| commit | 6c79f80768310baab38496255d349e722aa173c8 (patch) | |
| tree | 711589ad4910fb18359c3c06ad8324af08d76cc4 | |
| parent | dde838cc7d5c8d61162c2e6900a18397ddaab592 (diff) | |
| download | gnutls-6c79f80768310baab38496255d349e722aa173c8.tar.gz | |
fix zlib handling in gnutls.pc
Only add zlib to gnutls.pc's Requies.private if zlib ships a pkg-config
file. Ancient (<< 1.2.3.1) versions don't. Otherwise add -lz to
Libs.private.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index a03421ffa6..d2326348c9 100644 --- a/configure.ac +++ b/configure.ac @@ -186,14 +186,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) gl_INIT |