aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2020-12-04 13:06:10 +0200
committerMarcoFalke <falke.marco@gmail.com>2020-12-10 13:54:52 +0100
commitf51e1cb2917bbd7b0966a7ad688e04fc3ce02ccf (patch)
tree032a2f34e4b0ed82abca18fc9e95ce4e4705b9f5
parent48f8929aade118469cb0014e78a15b4e71fdd17d (diff)
downloadbitcoin-f51e1cb2917bbd7b0966a7ad688e04fc3ce02ccf.tar.xz
build: Use Homebrew's sqlite package if it is available
Github-Pull: #20527 Rebased-From: ee7b84e63cbeadd5e680d69ff0548275581e9241
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f46942d81a..ffe192d558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -646,13 +646,17 @@ case $host in
dnl It's safe to add these paths even if the functionality is disabled by
dnl the user (--without-wallet or --without-gui for example).
- if $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x" && test "$use_bdb" != "no"; then
+ if test "x$use_bdb" != xno && $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then
bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null)
dnl This must precede the call to BITCOIN_FIND_BDB48 below.
BDB_CFLAGS="-I$bdb_prefix/include"
BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"
fi
+ if test "x$use_sqlite" != xno && $BREW list --versions sqlite3 >/dev/null; then
+ export PKG_CONFIG_PATH="$($BREW --prefix sqlite3 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
+ fi
+
if $BREW list --versions qt5 >/dev/null; then
export PKG_CONFIG_PATH="$($BREW --prefix qt5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
fi