mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

* configure.ac (dbus): Default to ifavailable. (Bug#75004)

Browse source
This commit is contained in:
Michael Albinus 2024-12-23 12:46:23 +01:00
parent 6017c6a986
commit b1de495eea
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -578,7 +578,7 @@ OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
OPTION_DEFAULT_OFF([pgtk], [use GTK to support window systems other than X]) OPTION_DEFAULT_OFF([pgtk], [use GTK to support window systems other than X])
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) OPTION_DEFAULT_IFAVAILABLE([dbus],[compile with D-Bus support])
AC_ARG_WITH([gconf],[AS_HELP_STRING([--with-gconf], AC_ARG_WITH([gconf],[AS_HELP_STRING([--with-gconf],
[compile with Gconf support (Gsettings replaces this)])],[], [compile with Gconf support (Gsettings replaces this)])],[],
[if test $with_features = yes; then [if test $with_features = yes; then
@ -3969,8 +3969,8 @@ dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
dnl other platforms. dnl other platforms.
HAVE_DBUS=no HAVE_DBUS=no
DBUS_OBJ= DBUS_OBJ=
if test "${with_dbus}" = "yes"; then if test "${with_dbus}" != "no" ; then
EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0]) EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0], [HAVE_DBUS=yes], [HAVE_DBUS=no])
if test "$HAVE_DBUS" = yes; then if test "$HAVE_DBUS" = yes; then
AC_DEFINE([HAVE_DBUS], [1], [Define to 1 if using D-Bus.]) AC_DEFINE([HAVE_DBUS], [1], [Define to 1 if using D-Bus.])
dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1. dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
@ -5564,6 +5564,11 @@ if test "${HAVE_X11}" = "yes"; then
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tiff=ifavailable";; WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tiff=ifavailable";;
esac esac
fi fi
case $with_dbus,$HAVE_DBUS in
no,* | ifavailable,* | *,yes) ;;
*) MISSING="$MISSING dbus-1"
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-dbus=ifavailable";;
esac
case $with_gnutls,$HAVE_GNUTLS in case $with_gnutls,$HAVE_GNUTLS in
no,* | ifavailable,* | *,yes) ;; no,* | ifavailable,* | *,yes) ;;
*) MISSING="$MISSING gnutls" *) MISSING="$MISSING gnutls"