diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-03-15 21:33:49 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-16 11:05:28 +0100 |
| commit | 92d25e4eebbc20c4b056faeab688b2cef5790bac (patch) | |
| tree | 89c4759fd580b99cb3fcdac39d3ae4e6aa491f62 | |
| parent | 75f0bbe011267e70140393ed582a437ab3d5f750 (diff) | |
build: fix explicit --disable-qt-dbusv0.9.0
It worked in the auto/yes cases, but an explicit disable actually forced
it on.
Rebased-From: a22e9a3
| -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") |