diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-16 11:04:38 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-16 11:04:52 +0100 |
| commit | 1699e3a8682bcd208fcc1325eb4d02465fef4426 (patch) | |
| tree | c784701f4f19891dd92ed5d1ef9a5124b73edcab | |
| parent | 16254b6e14cf88f9afc6c49178c16018106c019d (diff) | |
| parent | a22e9a32b33e3ee2f871944e633af36129451387 (diff) | |
| download | bitcoin-1699e3a8682bcd208fcc1325eb4d02465fef4426.tar.xz | |
Merge pull request #3881
a22e9a3 build: fix explicit --disable-qt-dbus (Cory Fields)
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index 068371e83a..e71ecd7172 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -124,12 +124,12 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ if test x$have_qt_test = xno; then bitcoin_enable_qt_test=no fi - bitcoin_enable_qt_dbus=yes - if test x$have_qt_dbus = xno; then - bitcoin_enable_qt_dbus=no - if test x$use_dbus = xyes; then - AC_MSG_ERROR("libQtDBus not found. Install libQtDBus or remove --with-qtdbus.") - fi + bitcoin_enable_qt_dbus=no + if test x$use_dbus != xno && test x$have_qt_dbus = xyes; then + bitcoin_enable_qt_dbus=yes + fi + if test x$use_dbus = xyes && test x$have_qt_dbus = xno; then + AC_MSG_ERROR("libQtDBus not found. Install libQtDBus or remove --with-qtdbus.") fi if test x$LUPDATE == x; then AC_MSG_WARN("lupdate is required to update qt translations") |