sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #17547: build: Fix configure report about qr

Browse Source 
651c636f9ed4a60c4cd003e566e3ac6ae6eda3ed build: Fix configure report about qr (Hennadii Stepanov)

Pull request description:

  On master (b7bc9b8330096d1f4f1fa563b855b88da425226e):
  ```
  $ 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 651c636f9ed4a60c4cd003e566e3ac6ae6eda3ed
  fanquake:
    ACK 651c636f9ed4a60c4cd003e566e3ac6ae6eda3ed

Tree-SHA512: 8959b1c7da5b28d06affcdd27ff4e455f1f7d9c8363dbde8ef07aaf79139ec8bc7ce25610b28e1d90c7e168573ee90ac9ab359bf10c667d0254507f8a880a935
This commit is contained in:
fanquake 2019-12-03 16:15:14 -05:00 committed by pasta
parent 41aba0a27a
commit 5ba4b29671
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1423,18 +1423,16 @@ if test x$bitcoin_enable_qt != xno; then
AC_MSG_CHECKING([whether to build GUI with support for QR codes]) AC_MSG_CHECKING([whether to build GUI with support for QR codes])
if test x$have_qrencode = xno; then if test x$have_qrencode = xno; then
if test x$use_qr = xyes; then if test x$use_qr = xyes; then
AC_MSG_ERROR("QR support requested but cannot be built. use --without-qrencode") AC_MSG_ERROR([QR support requested but cannot be built. Use --without-qrencode])
fi fi
AC_MSG_RESULT(no) use_qr=no
else else
if test x$use_qr != xno; then if test x$use_qr != xno; then
AC_MSG_RESULT(yes)
AC_DEFINE([USE_QRCODE],[1],[Define if QR support should be compiled in]) AC_DEFINE([USE_QRCODE],[1],[Define if QR support should be compiled in])
use_qr=yes use_qr=yes
else
AC_MSG_RESULT(no)
fi fi
fi fi
AC_MSG_RESULT([$use_qr])
if test x$XGETTEXT = x; then if test x$XGETTEXT = x; then
AC_MSG_WARN("xgettext is required to update qt translations") AC_MSG_WARN("xgettext is required to update qt translations")