mirror of git://git.gnupg.org/gnupg.git
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>
This commit is contained in:
parent
11d917c779
commit
6cac2bd038
|
@ -124,6 +124,7 @@ build_agent=yes
|
||||||
GNUPG_BUILD_PROGRAM(scdaemon, yes)
|
GNUPG_BUILD_PROGRAM(scdaemon, yes)
|
||||||
GNUPG_BUILD_PROGRAM(g13, no)
|
GNUPG_BUILD_PROGRAM(g13, no)
|
||||||
GNUPG_BUILD_PROGRAM(dirmngr, yes)
|
GNUPG_BUILD_PROGRAM(dirmngr, yes)
|
||||||
|
GNUPG_BUILD_PROGRAM(keyboxd, yes)
|
||||||
GNUPG_BUILD_PROGRAM(doc, yes)
|
GNUPG_BUILD_PROGRAM(doc, yes)
|
||||||
GNUPG_BUILD_PROGRAM(symcryptrun, no)
|
GNUPG_BUILD_PROGRAM(symcryptrun, no)
|
||||||
# We use gpgtar to unpack test data, hence we always build it. If the
|
# 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])
|
AC_SUBST([SQLITE3_LIBS])
|
||||||
else
|
else
|
||||||
use_tofu=no
|
use_tofu=no
|
||||||
|
build_keyboxd=no
|
||||||
tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
|
tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
|
||||||
AC_MSG_WARN([[
|
AC_MSG_WARN([[
|
||||||
***
|
***
|
||||||
*** Building without SQLite support - TOFU disabled
|
*** Building without SQLite support - TOFU and Keyboxd disabled
|
||||||
***
|
***
|
||||||
*** $tmp]])
|
*** $tmp]])
|
||||||
fi
|
fi
|
||||||
|
@ -1834,6 +1836,7 @@ AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
|
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes")
|
AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "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_DOC, test "$build_doc" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
|
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
|
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
|
||||||
|
@ -1861,6 +1864,9 @@ fi
|
||||||
if test "$build_dirmngr" = yes ; then
|
if test "$build_dirmngr" = yes ; then
|
||||||
AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if DIRMNGR is to be build])
|
AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if DIRMNGR is to be build])
|
||||||
fi
|
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
|
if test "$build_g13" = yes ; then
|
||||||
AC_DEFINE(BUILD_WITH_G13,1,[Defined if G13 is to be build])
|
AC_DEFINE(BUILD_WITH_G13,1,[Defined if G13 is to be build])
|
||||||
fi
|
fi
|
||||||
|
@ -2105,6 +2111,7 @@ echo "
|
||||||
Smartcard: $build_scdaemon $build_scdaemon_extra
|
Smartcard: $build_scdaemon $build_scdaemon_extra
|
||||||
G13: $build_g13
|
G13: $build_g13
|
||||||
Dirmngr: $build_dirmngr
|
Dirmngr: $build_dirmngr
|
||||||
|
Keyboxd: $build_keyboxd
|
||||||
Gpgtar: $build_gpgtar
|
Gpgtar: $build_gpgtar
|
||||||
WKS tools: $build_wks_tools
|
WKS tools: $build_wks_tools
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,13 @@ endif
|
||||||
|
|
||||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
|
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libkeybox.a libkeybox509.a
|
|
||||||
bin_PROGRAMS = kbxutil
|
bin_PROGRAMS = kbxutil
|
||||||
|
noinst_LIBRARIES = libkeybox.a libkeybox509.a
|
||||||
|
if BUILD_KEYBOXD
|
||||||
libexec_PROGRAMS = keyboxd
|
libexec_PROGRAMS = keyboxd
|
||||||
|
else
|
||||||
|
libexec_PROGRAMS =
|
||||||
|
endif
|
||||||
|
|
||||||
if HAVE_W32CE_SYSTEM
|
if HAVE_W32CE_SYSTEM
|
||||||
extra_libs = $(LIBASSUAN_LIBS)
|
extra_libs = $(LIBASSUAN_LIBS)
|
||||||
|
|
Loading…
Reference in New Issue