diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-29 15:26:31 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-01 19:26:29 -0400 |
| commit | 9fedafba4b903d7f3af044eb86dc313856e40b08 (patch) | |
| tree | 0418434db355a9318ce66234a13ddb14f510f6c1 /build-aux | |
| parent | 35eaa6b4573e06ac8cc757d6fe7e2ef3ebb8473f (diff) | |
| download | bitcoin-9fedafba4b903d7f3af044eb86dc313856e40b08.tar.xz | |
build: Fix OSX build when using Homebrew and qt5
Qt5 is bottled, so configure won't find it without some help. Use
brew to find out its prefix.
Also, qt5 added the host_bins variable to pkg-config, use it.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index edfde4cd79..71b1484894 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -152,6 +152,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ fi CPPFLAGS=$TEMP_CPPFLAGS ]) + + if test x$use_pkgconfig$qt_bin_path = xyes; then + if test x$bitcoin_qt_got_major_vers = x5; then + qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`" + fi + fi + BITCOIN_QT_PATH_PROGS([MOC], [moc-qt${bitcoin_qt_got_major_vers} moc${bitcoin_qt_got_major_vers} moc], $qt_bin_path) BITCOIN_QT_PATH_PROGS([UIC], [uic-qt${bitcoin_qt_got_major_vers} uic${bitcoin_qt_got_major_vers} uic], $qt_bin_path) BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt${bitcoin_qt_got_major_vers} rcc${bitcoin_qt_got_major_vers} rcc], $qt_bin_path) |