Skip to content

Commit 8915e4d

Browse files
committed
Merge bitcoin/bitcoin#26824: build: fix configuring with only bitcoin-util
0f883df build: fix configuring with only bitcoin-util (fanquake) Pull request description: Fixes the issue presented in #25037 in a single (easily backportable) diff, with no additional refactoring/changes. Can be tested with: ```bash ./configure \ --disable-tests \ --disable-bench \ --without-libs \ --without-daemon \ --without-gui \ --disable-fuzz-binary \ --without-utils \ --enable-util-util ``` ACKs for top commit: TheCharlatan: tACK 0f883df hebasto: ACK 0f883df, tested on Ubuntu 22.04. Tree-SHA512: 3682712405c360852c4edd90c171e21302154bf8789252c64083974a5c873cf04d97e8721c7916d5b2dafa6acd2b8dc32deecf550e90e03bcbbabbbbf75ce959
2 parents 3283403 + 0f883df commit 8915e4d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ if test "$use_natpmp" != "no"; then
14611461
CPPFLAGS="$TEMP_CPPFLAGS"
14621462
fi
14631463

1464-
if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench" = "nonononononono"; then
1464+
if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench" = "nononononononono"; then
14651465
use_boost=no
14661466
else
14671467
use_boost=yes
@@ -1870,7 +1870,7 @@ else
18701870
AC_MSG_RESULT([no])
18711871
fi
18721872

1873-
if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$enable_fuzz_binary$use_bench$use_tests" = "nonononononononono"; then
1873+
if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$enable_fuzz_binary$use_bench$use_tests" = "nononononononononono"; then
18741874
AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-fuzz(-binary) --enable-bench or --enable-tests])
18751875
fi
18761876

0 commit comments

Comments
 (0)