Skip to content

Commit

Permalink
[build] enable external signer by default for GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
Sjors committed Sep 16, 2020
1 parent 134d8d1 commit 7df0674
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
export RUN_FUNCTIONAL_TESTS=false
export RUN_SECURITY_TESTS="true"
export GOAL="deploy"
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process"
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --disable-external-signer"
24 changes: 12 additions & 12 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,6 @@ AC_ARG_ENABLE([upnp-default],
[use_upnp_default=$enableval],
[use_upnp_default=no])

dnl Enable external signer support when opting in to boost process (and not opting out of wallet)
if test x$with_boost_process = xyes && test x$enable_wallet != xno; then
use_external_signer_default=yes;
else
use_external_signer_default=no;
fi

AC_ARG_ENABLE([external-signer],
[AS_HELP_STRING([--enable-external-signer],[compile external signer support (requires Boost::Process)])],
[use_external_signer=$enableval],
[use_external_signer=$use_external_signer_default])

AC_ARG_ENABLE(tests,
AS_HELP_STRING([--disable-tests],[do not compile tests (default is to compile)]),
[use_tests=$enableval],
Expand Down Expand Up @@ -1185,6 +1173,18 @@ else
BITCOIN_QT_CONFIGURE([5.5.1])
fi

dnl Enable external signer support when opting in to boost process, or building GUI, but not opting out of wallet)
if (test x$with_boost_process = xyes || test x$bitcoin_enable_qt != xno) && test x$enable_wallet != xno; then
use_external_signer_default=yes;
else
use_external_signer_default=no;
fi

AC_ARG_ENABLE([external-signer],
[AS_HELP_STRING([--enable-external-signer],[compile external signer support (requires Boost::Process)])],
[use_external_signer=$enableval],
[use_external_signer=$use_external_signer_default])

if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled
BITCOIN_FIND_BDB48
Expand Down

0 comments on commit 7df0674

Please sign in to comment.