tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile without X

diff --git a/ChangeLog b/ChangeLog
index 1fcc5957321ae23a82d2e03c025cfaf8a8cc55db..7d360ebad8f675b1c31a42af0e77f11289822e16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  John (J5) Palmieri  <johnp@redhat.com>
+
+       * tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile 
+         without X
+
 2008-02-28  John (J5) Palmieri  <johnp@redhat.com>
 
        * dbus/dbus-sysdeps-unix.c: define _AI_ADDRCONFIG as 0 if not

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 5d6e77e819e3b48172c92cd77a1e65a100cddb7c..6a10ffa3701124f8123e857106385aac9060902c 100644 (file)
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -966,7 +966,9 @@ main (int argc, char **argv)
       char write_pid_fd_as_string[MAX_FD_LEN];
       char write_address_fd_as_string[MAX_FD_LEN];
 
+#ifdef DBUS_BUILD_X11
       xdisplay = NULL;
+#endif
 
       if (close_stderr)
        do_close_stderr ();