Skip to content

Commit c96d1f6

Browse files
committed
build, refactor: Check that Homebrew's qt5 package is actually installed
This change unifies Homebrew packages workflow, and does not change behavior.
1 parent dca80ff commit c96d1f6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

configure.ac

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,16 +642,15 @@ case $host in
642642
dnl It's safe to add these paths even if the functionality is disabled by
643643
dnl the user (--without-wallet or --without-gui for example).
644644

645-
qt5_prefix=$($BREW --prefix qt5 2>/dev/null)
646645
if $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x" && test "$use_bdb" != "no"; then
647646
bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null)
648647
dnl This must precede the call to BITCOIN_FIND_BDB48 below.
649648
BDB_CFLAGS="-I$bdb_prefix/include"
650649
BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"
651650
fi
652-
if test x$qt5_prefix != x; then
653-
PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
654-
export PKG_CONFIG_PATH
651+
652+
if $BREW list --versions qt5 >/dev/null; then
653+
export PKG_CONFIG_PATH="$($BREW --prefix qt5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
655654
fi
656655
fi
657656
else

0 commit comments

Comments
 (0)