From becd67979ddf8632ebeba88e05660b38b3fcfb54 Mon Sep 17 00:00:00 2001
From: Sjors Provoost <sjors@sprovoost.nl>
Date: Tue, 16 Jun 2020 18:56:11 +0200
Subject: [PATCH] [build] enable external signer by default for GUI

---
 ci/test/00_setup_env_win64.sh |  2 +-
 configure.ac                  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 2b351dff6d9..eefed86637a 100644
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -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"
diff --git a/configure.ac b/configure.ac
index dcd1c590795..a12ac4ea088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,18 +133,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],
@@ -1157,6 +1145,18 @@ else
   BITCOIN_QT_CONFIGURE
 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