Don't add p11-kit to CFLAGS/LIBS globally, just where it is needed.

diff --git a/configure.ac b/configure.ac
index 70554cfe81ce3064fbadea6e52493e7932dd8bcc..5c67940a034599fa4203228bf341b3087072c4ea 100644 (file)
--- 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"

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 90c336922f3175f930067ce52691f4c62eefcd99..74258b5f4582eb02cd14fa9b157db8d26fef6717 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,8 @@ AM_CPPFLAGS = \
        -I$(builddir)/x509                      \
        -I$(srcdir)/includes                    \
        -I$(builddir)/includes                  \
-       -I$(srcdir)/x509
+       -I$(srcdir)/x509                        \
+       $(P11_KIT_CFLAGS)
 
 if ENABLE_OPENPGP
 SUBDIRS += opencdk
@@ -114,7 +115,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
        accelerated/libaccelerated.la ext/libgnutls_ext.la \
        auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
        $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
-       $(LTLIBPTHREAD)
+       $(LTLIBPTHREAD) $(P11_KIT_LIBS)
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la