Merge pull request #3881

a22e9a3 build: fix explicit --disable-qt-dbus (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2014-03-16 11:04:38 +01:00
commit 1699e3a868
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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")