Skip to content

Commit bce4408

Browse files
committed
Merge #17547: build: Fix configure report about qr
651c636 build: Fix configure report about qr (Hennadii Stepanov) Pull request description: On master (b7bc9b8): ``` $ apt list libqrencode-dev Listing... Done libqrencode-dev/bionic 3.4.4-1build1 amd64 $ ./configure | grep -i qr checking for QR... no checking whether to build GUI with support for QR codes... no with qr = auto ``` With this PR: ``` $ apt list libqrencode-dev Listing... Done libqrencode-dev/bionic 3.4.4-1build1 amd64 $ ./configure | grep -i qr checking for QR... no checking whether to build GUI with support for QR codes... no with qr = no ``` ACKs for top commit: laanwj: Concept and light code review ACK 651c636 fanquake: ACK 651c636 Tree-SHA512: 8959b1c7da5b28d06affcdd27ff4e455f1f7d9c8363dbde8ef07aaf79139ec8bc7ce25610b28e1d90c7e168573ee90ac9ab359bf10c667d0254507f8a880a935
2 parents e354db7 + 651c636 commit bce4408

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

configure.ac

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,18 +1471,16 @@ if test x$bitcoin_enable_qt != xno; then
14711471
AC_MSG_CHECKING([whether to build GUI with support for QR codes])
14721472
if test x$have_qrencode = xno; then
14731473
if test x$use_qr = xyes; then
1474-
AC_MSG_ERROR("QR support requested but cannot be built. use --without-qrencode")
1474+
AC_MSG_ERROR([QR support requested but cannot be built. Use --without-qrencode])
14751475
fi
1476-
AC_MSG_RESULT(no)
1476+
use_qr=no
14771477
else
14781478
if test x$use_qr != xno; then
1479-
AC_MSG_RESULT(yes)
14801479
AC_DEFINE([USE_QRCODE],[1],[Define if QR support should be compiled in])
14811480
use_qr=yes
1482-
else
1483-
AC_MSG_RESULT(no)
14841481
fi
14851482
fi
1483+
AC_MSG_RESULT([$use_qr])
14861484

14871485
if test x$XGETTEXT = x; then
14881486
AC_MSG_WARN("xgettext is required to update qt translations")

0 commit comments

Comments
 (0)