From ca5becfaba5a7783b94fbee109a99f682e2b871d Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 21 Jun 2012 17:04:23 +0100 Subject: [PATCH] Don't require zlib in pkgconfig if it was found without it Signed-off-by: David Woodhouse --- configure.ac | 2 +- openconnect.pc.in | 2 +- www/changelog.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 314d7d4..9eedcce 100644 --- a/configure.ac +++ b/configure.ac @@ -359,7 +359,7 @@ AM_CONDITIONAL(HAVE_SYMBOL_VERSIONING, [test "${symvers}" != "no"]) PKG_CHECK_MODULES(LIBXML2, libxml-2.0) -PKG_CHECK_MODULES(ZLIB, zlib, [], +PKG_CHECK_MODULES(ZLIB, zlib, [AC_SUBST(ZLIB_PC, [zlib])], [oldLIBS="$LIBS" LIBS="$LIBS -lz" AC_MSG_CHECKING([for zlib without pkg-config]) diff --git a/openconnect.pc.in b/openconnect.pc.in index 23b818f..012431f 100644 --- a/openconnect.pc.in +++ b/openconnect.pc.in @@ -7,7 +7,7 @@ includedir=@includedir@ Name: openconnect Description: OpenConnect VPN client Version: @VERSION@ -Requires.private: @LIBPROXY_PC@ zlib @SSL_LIBRARY@ @P11KIT_PC@ libxml-2.0 +Requires.private: @LIBPROXY_PC@ @ZLIB_PC@ @SSL_LIBRARY@ @P11KIT_PC@ libxml-2.0 Libs: -L${libdir} -lopenconnect Libs.private: @LIBINTL@ Cflags: -I${includedir} diff --git a/www/changelog.xml b/www/changelog.xml index 76c5454..d2f2786 100644 --- a/www/changelog.xml +++ b/www/changelog.xml @@ -17,7 +17,7 @@