From: Sergei Chernyadyev 1892-Cherser-s@users.noreply.gitlab.winehq.org
--- configure | 6 ++++-- configure.ac | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index 81627094416..796a0d20906 100755 --- a/configure +++ b/configure @@ -2445,7 +2445,7 @@ Optional Packages: --without-capi do not use CAPI (ISDN support) --without-coreaudio do not use the CoreAudio sound support --without-cups do not use CUPS - --without-dbus do not use DBus (dynamic device support) + --without-dbus do not use DBus (dynamic device support, SNI tray) --with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library @@ -16077,9 +16077,11 @@ fi
CPPFLAGS=$ac_save_CPPFLAGS
+else + enable_winesni_drv=no fi case $host_os in - darwin*|macosx*) ;; + darwin*|macosx*) enable_winesni_drv=no ;; *) if test "x$ac_cv_lib_soname_dbus_1" = "x" then : case "x$with_dbus" in diff --git a/configure.ac b/configure.ac index fd215f99619..6ab383ecc09 100644 --- a/configure.ac +++ b/configure.ac @@ -1394,9 +1394,11 @@ then [AC_CHECK_HEADER([dbus/dbus.h], [WINE_CHECK_SONAME(dbus-1, dbus_connection_close,,[DBUS_CFLAGS=""],[$DBUS_LIBS])], [DBUS_CFLAGS=""])]) +else + enable_winesni_drv=no fi case $host_os in - darwin*|macosx*) ;; + darwin*|macosx*) enable_winesni_drv=no ;; *) WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x"], [libdbus ${notice_platform}development files not found, no dynamic device support.], [enable_winesni_drv]) ;; esac