summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-11-09 10:16:26 +0100
committerSimon Josefsson <simon@josefsson.org>2011-11-09 10:42:18 +0100
commit0db087a07b271329d85c5f806a06ef5199fd323a (patch)
treef6b55f302f2bcfbd289a1a31de72274bbb9f970c /configure.ac
parentce43f3cfab492cacbd669ed880552050d0557bf2 (diff)
downloadgnutls-0db087a07b271329d85c5f806a06ef5199fd323a.tar.gz
Don't add p11-kit to CFLAGS/LIBS globally, just where it is needed.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 70554cfe81..5c67940a03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,8 +139,6 @@ if test "$with_p11_kit" != "no"; then
PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4], [with_p11_kit=yes], [with_p11_kit=no])
if test "$with_p11_kit" != "no";then
AC_DEFINE([ENABLE_PKCS11], 1, [Build PKCS#11 support])
- CFLAGS="$CFLAGS $P11_KIT_CFLAGS"
- LIBS="$LIBS $P11_KIT_LIBS"
if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
GNUTLS_REQUIRES_PRIVATE="Requires.private: p11-kit-1"
else
@@ -218,7 +216,7 @@ 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"
+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
fi
else
GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"