diff --git a/NEWS.md b/NEWS.md index 23c45e3be..99b11221a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# Version ? + +## Bug fixes + +* configure: fixed setting `HAVE_QTDBUS` properly if the QtDbus module is + found. Fixes #3744. + + # Version 87.0 "Black as the Sky" 2024-09-07 ## New features and enhancements diff --git a/ac/qt6.m4 b/ac/qt6.m4 index 4c10cde0a..e9c03c9cf 100644 --- a/ac/qt6.m4 +++ b/ac/qt6.m4 @@ -77,6 +77,7 @@ EOT fi fi + dbus=0 modules_to_test=dbus if test x"$enable_gui" = xno; then @@ -103,7 +104,7 @@ EOT continue elif test $qt_module = dbus; then qmake_qt_ui="$qmake_qt_ui dbus" - AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) + dbus=1 fi done @@ -265,6 +266,9 @@ return 0; fi AC_DEFINE(HAVE_QT, 1, [Define if Qt is present]) + if test "x$dbus" = x1; then + AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) + fi AC_MSG_CHECKING(for Qt 6) AC_MSG_RESULT(yes) have_qt6=yes