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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 5 insertions, 3 deletions
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...]) |