diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-11-09 10:16:26 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-11-09 10:42:18 +0100 |
| commit | 0db087a07b271329d85c5f806a06ef5199fd323a (patch) | |
| tree | f6b55f302f2bcfbd289a1a31de72274bbb9f970c | |
| parent | ce43f3cfab492cacbd669ed880552050d0557bf2 (diff) | |
| download | gnutls-0db087a07b271329d85c5f806a06ef5199fd323a.tar.gz | |
Don't add p11-kit to CFLAGS/LIBS globally, just where it is needed.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lib/Makefile.am | 5 |
2 files changed, 4 insertions, 5 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" diff --git a/lib/Makefile.am b/lib/Makefile.am index 90c336922f..74258b5f45 100644 --- 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 |