summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2020-02-13 16:18:12 +0100
committerWerner Koch <wk@gnupg.org>2020-02-13 16:18:12 +0100
commit6cac2bd0382eb7ed0d249f077522516e64fc1d8f (patch)
treeffa9a98d6596718fdf788ab712c23f617d43ffd5 /configure.ac
parentscd: Print the main app name also for not fully supported cards. (diff)
downloadgnupg2-6cac2bd0382eb7ed0d249f077522516e64fc1d8f.tar.xz
gnupg2-6cac2bd0382eb7ed0d249f077522516e64fc1d8f.zip
build: New configure option --disable-keyboxd
* configure.ac: Add option --dsiable-keyboxd * kbx/Makefile.am: Do not build keyboxd in that case. -- This is useful to build a minimal version of gpgv. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 12a8feaf2..52a5f6811 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,7 @@ build_agent=yes
GNUPG_BUILD_PROGRAM(scdaemon, yes)
GNUPG_BUILD_PROGRAM(g13, no)
GNUPG_BUILD_PROGRAM(dirmngr, yes)
+GNUPG_BUILD_PROGRAM(keyboxd, yes)
GNUPG_BUILD_PROGRAM(doc, yes)
GNUPG_BUILD_PROGRAM(symcryptrun, no)
# We use gpgtar to unpack test data, hence we always build it. If the
@@ -948,10 +949,11 @@ if test x"$use_tofu" = xyes ; then
AC_SUBST([SQLITE3_LIBS])
else
use_tofu=no
+ build_keyboxd=no
tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
AC_MSG_WARN([[
***
-*** Building without SQLite support - TOFU disabled
+*** Building without SQLite support - TOFU and Keyboxd disabled
***
*** $tmp]])
fi
@@ -1834,6 +1836,7 @@ AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes")
AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "yes")
+AM_CONDITIONAL(BUILD_KEYBOXD, test "$build_keyboxd" = "yes")
AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes")
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
@@ -1861,6 +1864,9 @@ fi
if test "$build_dirmngr" = yes ; then
AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if DIRMNGR is to be build])
fi
+if test "$build_keyboxd" = yes ; then
+ AC_DEFINE(BUILD_WITH_KEYBOXD,1,[Defined if KEYBOXD is to be build])
+fi
if test "$build_g13" = yes ; then
AC_DEFINE(BUILD_WITH_G13,1,[Defined if G13 is to be build])
fi
@@ -2105,6 +2111,7 @@ echo "
Smartcard: $build_scdaemon $build_scdaemon_extra
G13: $build_g13
Dirmngr: $build_dirmngr
+ Keyboxd: $build_keyboxd
Gpgtar: $build_gpgtar
WKS tools: $build_wks_tools