diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 12:49:54 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-25 17:38:44 +0100 |
| commit | cea055514a9dfc74e7f0515cf4a256da10a891bc (patch) | |
| tree | 7eebfffd15b9a50bb940df402aeef5fc982a85b5 /test/name-test | |
| parent | 2bfac1b73d7aa1524452a16ff85a025c61883f8a (diff) | |
| download | dbus-cea055514a9dfc74e7f0515cf4a256da10a891bc.tar.gz dbus-cea055514a9dfc74e7f0515cf4a256da10a891bc.tar.bz2 dbus-cea055514a9dfc74e7f0515cf4a256da10a891bc.zip | |
Check for X even if X11 autolaunching is disabled
DBUS_ENABLE_X11_AUTOLAUNCH obviously requires DBUS_BUILD_X11. However,
the converse is not true.
If DBUS_BUILD_X11 is defined, dbus-launch will be able to connect to
the X server to determine when the session ends; most distributors will
want this, but it can be disabled with the standard Autoconf option
--without-x.
If DBUS_ENABLE_X11_AUTOLAUNCH is *also* defined, dbus-launch and libdbus
will be willing to perform autolaunch. Again, most distributors will want
this, but it can be disabled with --disable-x11-autolaunch.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Reviewed-by: Colin Walters <walters@verbum.org>
Diffstat (limited to 'test/name-test')
| -rw-r--r-- | test/name-test/test-autolaunch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/name-test/test-autolaunch.c b/test/name-test/test-autolaunch.c index d50dfbff..5e519895 100644 --- a/test/name-test/test-autolaunch.c +++ b/test/name-test/test-autolaunch.c @@ -20,7 +20,7 @@ main (int argc, char *argv[]) conn = dbus_bus_get (DBUS_BUS_SESSION, &error); -#ifdef DBUS_BUILD_X11 +#ifdef DBUS_ENABLE_X11_AUTOLAUNCH if (dbus_error_is_set (&error)) { fprintf (stderr, "*** Failed to autolaunch session bus: %s\n", |