summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-31 17:41:42 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-31 17:43:47 +0200
commit34365450fd427b4eb98290c73b161b85d1d90b5f (patch)
tree3d729bbc5c61d4d9044e81f4c7ed7e1cfe2f27dc
parent240cae972d30ca4de7ead5f85b8bea113bef437a (diff)
downloadgnutls-34365450fd427b4eb98290c73b161b85d1d90b5f.tar.gz
do not exit configure if p11-kit is not found.
-rw-r--r--configure.ac17
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 6971470fe2..be6573be12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,11 +125,18 @@ AC_ARG_WITH(p11-kit,
[Build without p11-kit and PKCS#11 support]))
AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
if test "$with_p11_kit" != "no"; then
- PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4])
- AC_DEFINE([ENABLE_PKCS11], 1, [Build PKCS#11 support])
- CFLAGS="$CFLAGS $P11_KIT_CFLAGS"
- LIBS="$LIBS $P11_KIT_LIBS"
- with_p11_kit=yes
+ 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"
+ else
+ AC_MSG_WARN([[
+***
+*** p11-kit was not found. PKCS #11 support will be disabled.
+*** You may get it from http://p11-glue.freedesktop.org/p11-kit.html
+*** ]])
+ fi
fi
dnl Check for libcfg+