diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-10 14:31:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-11 09:47:25 +1000 |
| commit | 7805e45284264b4cd286eece02e85426896e9f7b (patch) | |
| tree | c9fcb7165549637e5433bf33d557eaedbd9eee9f | |
| parent | 66b21b2f455a1dfbc92f7caa571dcff3f3765808 (diff) | |
config: remove redundant DBUS API define, require dbus-1 >= 1.0
It's still being pulled in by the HAL CFLAGS but the requirement to define
this was dropped from DBus pre 1.0 (November 2006).
This means we require dbus 1.0 now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
| -rw-r--r-- | config/dbus.c | 1 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/dbus.c b/config/dbus.c index 4888f621c..b67fddb3e 100644 --- a/config/dbus.c +++ b/config/dbus.c @@ -27,7 +27,6 @@ #include <dix-config.h> #endif -#define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> #include <string.h> diff --git a/configure.ac b/configure.ac index 81b6e4c1c..02660a6b4 100644 --- a/configure.ac +++ b/configure.ac @@ -809,6 +809,7 @@ LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" LIBUDEV="libudev >= 143" LIBSELINUX="libselinux >= 2.0.86" +LIBDBUS="dbus-1 >= 1.0" if test "x$CONFIG_UDEV" = xyes && { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then @@ -832,7 +833,7 @@ fi dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config dnl API. -PKG_CHECK_MODULES(DBUS, dbus-1, [HAVE_DBUS=yes], [HAVE_DBUS=no]) +PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no]) if test "x$HAVE_DBUS" = xyes; then AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support]) fi |