diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-02 19:52:58 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-07-16 03:02:04 +0300 |
| commit | 441f084bfe87a6ea1c94ec63f82888b8b3d81d89 (patch) | |
| tree | 22385699d56a8f45c6215b738a3073f8b85715ef /config | |
| parent | 35c89f3f5b8fa222e37b799d5bb01595e8f30d0c (diff) | |
config: Don't attempt to use D-Bus when not strictly necessary
If we have D-Bus but have explicitly disabled it, don't build it.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rw-r--r-- | config/config-backends.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 056f30ed0..1e7c501c3 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = @DIX_CFLAGS@ noinst_LIBRARIES = libconfig.a libconfig_a_SOURCES = config.c config-backends.h -if HAVE_DBUS +if CONFIG_NEED_DBUS AM_CFLAGS += @DBUS_CFLAGS@ libconfig_a_SOURCES += dbus-core.c endif diff --git a/config/config-backends.h b/config/config-backends.h index ce0e5e436..907e86b9c 100644 --- a/config/config-backends.h +++ b/config/config-backends.h @@ -27,7 +27,7 @@ #include <dix-config.h> #endif -#ifdef HAVE_DBUS +#ifdef CONFIG_NEED_DBUS #include <dbus/dbus.h> typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, |