Skip to content

Commit d3edc5b

Browse files
kwvgPastaPastaPasta
authored andcommitted
merge bitcoin#21629: fix configuring when building depends with NO_BDB=1
1 parent 18098c3 commit d3edc5b

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,9 +1321,11 @@ fi
13211321

13221322
if test x$enable_wallet != xno; then
13231323
dnl Check for libdb_cxx only if wallet enabled
1324-
BITCOIN_FIND_BDB48
1325-
if test x$suppress_external_warnings != xno ; then
1324+
if test "x$use_bdb" != "xno"; then
1325+
BITCOIN_FIND_BDB48
1326+
if test x$suppress_external_warnings != xno ; then
13261327
BDB_CPPFLAGS=SUPPRESS_WARNINGS($BDB_CPPFLAGS)
1328+
fi
13271329
fi
13281330

13291331
dnl Check for sqlite3

depends/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ BASE_CACHE ?= $(BASEDIR)/built
3434
SDK_PATH ?= $(BASEDIR)/SDKs
3535
NO_QT ?=
3636
NO_QR ?=
37+
NO_BDB ?=
38+
NO_SQLITE ?=
3739
NO_WALLET ?=
3840
NO_ZMQ ?=
3941
NO_UPNP ?=
@@ -221,6 +223,8 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
221223
-e 's|@no_qr@|$(NO_QR)|' \
222224
-e 's|@no_zmq@|$(NO_ZMQ)|' \
223225
-e 's|@no_wallet@|$(NO_WALLET)|' \
226+
-e 's|@no_bdb@|$(NO_BDB)|' \
227+
-e 's|@no_sqlite@|$(NO_SQLITE)|' \
224228
-e 's|@no_upnp@|$(NO_UPNP)|' \
225229
-e 's|@no_natpmp@|$(NO_NATPMP)|' \
226230
-e 's|@debug@|$(DEBUG)|' \

depends/config.site.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ if test -z "$enable_wallet" && test -n "@no_wallet@"; then
3535
enable_wallet=no
3636
fi
3737

38+
if test -z "$with_bdb" && test -n "@no_bdb@"; then
39+
with_bdb=no
40+
fi
41+
42+
if test -z "$with_sqlite" && test -n "@no_sqlite@"; then
43+
with_sqlite=no
44+
fi
45+
3846
if test -z "$with_miniupnpc" && test -n "@no_upnp@"; then
3947
with_miniupnpc=no
4048
fi

0 commit comments

Comments
 (0)