diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-12-04 13:02:08 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-12-10 13:54:50 +0100 |
| commit | 48f8929aade118469cb0014e78a15b4e71fdd17d (patch) | |
| tree | 6adb6fdf4772542e983d69580202988c2a679916 | |
| parent | 96124a204193ed114ca9594df7d5151206990e91 (diff) | |
build, refactor: Check that Homebrew's qt5 package is actually installed
This change unifies Homebrew packages workflow, and does not change
behavior.
Github-Pull: #20527
Rebased-From: c96d1f65a552712f8476269ad64a415717ead50d
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a7ee5625c8..f46942d81a 100644 --- a/configure.ac +++ b/configure.ac @@ -646,16 +646,15 @@ 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). - qt5_prefix=$($BREW --prefix qt5 2>/dev/null) if $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x" && test "$use_bdb" != "no"; 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$qt5_prefix != x; then - PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" - export PKG_CONFIG_PATH + + if $BREW list --versions qt5 >/dev/null; then + export PKG_CONFIG_PATH="$($BREW --prefix qt5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH" fi fi else |