diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-03-23 08:03:52 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-03-23 08:04:20 +0100 |
| commit | 5d91f952f576a9e056a7a602148b77017a89e156 (patch) | |
| tree | 71a8bb8cb7879db0badc8d084b293fea5e04a4da | |
| parent | 45dd985db7c0dd8bb50e3c172c1cecaf3c5cceba (diff) | |
| download | gnutls-tmp-fix-zlib-in-pc.tar.gz | |
gnutls.pc: don't include zlib twice in private libstmp-fix-zlib-in-pc
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | lib/gnutls.pc.in | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b98c47033c..2e94e1693e 100644 --- a/configure.ac +++ b/configure.ac @@ -746,12 +746,15 @@ if test x$ac_zlib != xno; then else GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" fi + LIBZ_PC="" + else + LIBZ_PC=$LIBZ fi fi +AC_SUBST(LIBZ_PC) AC_SUBST(GNUTLS_REQUIRES_PRIVATE) - AC_ARG_WITH([default-trust-store-pkcs11], [AS_HELP_STRING([--with-default-trust-store-pkcs11=URI], [use the given pkcs11 uri as default trust store])]) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index b8ce05104e..ec9d619168 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ +Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} |