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 <[email protected]> --- config/dbus.c | 1 - configure.ac | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dbus.c b/config/dbus.c index 4888f62..b67fddb 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 c8b49de..ffeb762 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 -- 1.7.0.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
