diff options
| author | fanquake <fanquake@gmail.com> | 2019-10-01 17:56:46 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-10-01 18:11:47 +0800 |
| commit | 52acd245734a2b85e9eff578f4b2c5bba1e23c30 (patch) | |
| tree | 47ebcf5dc4eba6e4a1e9d61e9ed424574dc2c5fe | |
| parent | cd6e9b33a65ce3509812046abc77b116a940aab0 (diff) | |
| parent | 57b0cd4db9ec26d5a00714016639e218cfa1ccda (diff) | |
| download | bitcoin-52acd245734a2b85e9eff578f4b2c5bba1e23c30.tar.xz | |
Merge #17005: build: Qt version appears only if GUI is being built
57b0cd4db9ec26d5a00714016639e218cfa1ccda build: Installed Qt version only appears if being built (Jon Layton)
Pull request description:
Closes #16989.
Simplifies `./configure` output for `x$bitcoin_enable_qt`.
Now:
`checking whether to build Bitcoin Core GUI... no`
`checking whether to build Bitcoin Core GUI... yes (Qt5)`
ACKs for top commit:
laanwj:
ACK 57b0cd4db9ec26d5a00714016639e218cfa1ccda
fanquake:
ACK 57b0cd4db9ec26d5a00714016639e218cfa1ccda
Tree-SHA512: 3ca2082f251c206bb1661277dac1075acea046f0a1d2cd997550aa83dd886036b7282f0e30cdaf51ed636d8a40d9b7ffb8600743450f4f4c014c541cb7b2eb0d
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 675fb6d3fb..d579dc2ed5 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -228,7 +228,11 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ ],[ bitcoin_enable_qt=no ]) - AC_MSG_RESULT([$bitcoin_enable_qt (Qt5)]) + if test x$bitcoin_enable_qt = xyes; then + AC_MSG_RESULT([$bitcoin_enable_qt ($QT_LIB_PREFIX)]) + else + AC_MSG_RESULT([$bitcoin_enable_qt]) + fi AC_SUBST(QT_PIE_FLAGS) AC_SUBST(QT_INCLUDES) |