From 5c0bc273cba53f822b7d777bbb6c35d160d3b505 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 15 Nov 2019 16:08:00 +1100
Subject: configure flag to built-in security key support

Require --with-security-key-builtin before enabling the built-in
security key support (and consequent dependency on libfido2).
---
 configure.ac | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3814db66b..0c2882b1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1908,6 +1908,16 @@ AC_ARG_ENABLE([security-key],
 		fi
 	]
 )
+enable_sk_internal=
+AC_ARG_WITH([security-key-builtin],
+	[  --with-security-key-builtin include builtin U2F/FIDO support],
+	[
+		if test "x$withval" != "xno" ; then
+			enable_sk_internal=yes
+		fi
+	]
+)
+test "x$disable_sk" != "x" && enable_sk_internal=""
 
 AC_SEARCH_LIBS([dlopen], [dl])
 AC_CHECK_FUNCS([dlopen])
@@ -3062,7 +3072,7 @@ fi
 AC_MSG_RESULT([$enable_sk])
 
 # Now check for built-in security key support.
-if test "x$enable_sk" = "xyes" ; then
+if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
 	AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
 	use_pkgconfig_for_libfido2=
 	if test "x$PKGCONFIG" != "xno"; then
-- 
cgit v1.2.3