Skip to content

Commit 2e34374

Browse files
committed
Merge bitcoin/bitcoin#26003: build: fix configuring with --without-experimental-kernel-lib
e531e34 build: fix configuring with --without-experimental-kernel-lib (fanquake) Pull request description: Fixes #25994. ACKs for top commit: Rspigler: tACK e531e34 ryanofsky: Code review ACK e531e34 Tree-SHA512: 029b58ec02aef2b96d3300085db8fce7653720482c65a1af6a2fb729b0546515579d2bb4676ceb2796ac12d5ccc4224f3990852bd68bcc9a59bb9b310976224f
2 parents bb378b6 + e531e34 commit 2e34374

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

configure.ac

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,11 +1695,12 @@ AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"])
16951695
AC_MSG_RESULT($build_bitcoin_util)
16961696

16971697
AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate])
1698-
if test "$build_experimental_kernel_lib" = "no"; then
1699-
AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]);
1700-
else
1701-
AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"])
1698+
if test "$build_bitcoin_chainstate" = "yes"; then
1699+
if test "$build_experimental_kernel_lib" = "no"; then
1700+
AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]);
1701+
fi
17021702
fi
1703+
AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"])
17031704
AC_MSG_RESULT($build_bitcoin_chainstate)
17041705

17051706
AC_MSG_CHECKING([whether to build libraries])

0 commit comments

Comments
 (0)