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 | |
| 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.
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rw-r--r-- | config/config-backends.h | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | include/dix-config.h.in | 3 |
4 files changed, 10 insertions, 5 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, diff --git a/configure.ac b/configure.ac index 7852a4dae..9daa13c2b 100644 --- a/configure.ac +++ b/configure.ac @@ -706,7 +706,7 @@ if test "x$CONFIG_DBUS_API" = xyes; then fi AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API]) - NEED_DBUS="yes" + CONFIG_NEED_DBUS="yes" fi AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes]) @@ -721,13 +721,15 @@ if test "x$CONFIG_HAL" = xyes; then AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) REQUIRED_LIBS="$REQUIRED_LIBS hal" - NEED_DBUS="yes" + CONFIG_NEED_DBUS="yes" fi AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) -if test "x$NEED_DBUS" = xyes; then +if test "x$CONFIG_NEED_DBUS" = xyes; then REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" + AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug]) fi +AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes]) CONFIG_LIB='$(top_builddir)/config/libconfig.a' AC_MSG_CHECKING([for glibc...]) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index b088ef814..e853aa93b 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -468,6 +468,9 @@ /* Support D-Bus */ #undef HAVE_DBUS +/* Use D-Bus for input hotplug */ +#undef CONFIG_NEED_DBUS + /* Support the D-Bus hotplug API */ #undef CONFIG_DBUS_API |