From 822db34008692dd3266ca41f8b2b03077ed515f1 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 1 Oct 2019 17:56:46 +0800 Subject: [PATCH] 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 --- build-aux/m4/bitcoin_qt.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index de506109bc..01be2f330e 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -243,7 +243,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)