From df01c98cc7e83f3336e501fcf2eeee52c95464fb Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Sun, 4 May 2003 08:54:24 +0000
Subject: 2003-05-04  Havoc Pennington  <hp@pobox.com>

	* tools/dbus-launch.c: implement

	* bus/main.c (main), bus/bus.c (bus_context_new):
	implement --print-pid and --fork
---
 configure.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index b36aeba9..18cb519e 100644
--- a/configure.in
+++ b/configure.in
@@ -440,10 +440,6 @@ AC_SUBST(DBUS_QT_LIBS)
 
 ### X11 detection
 AC_PATH_XTRA
-DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-DBUS_X_CFLAGS="$X_CFLAGS"
-AC_SUBST(DBUS_X_CFLAGS)
-AC_SUBST(DBUS_X_LIBS)
 
 ## for now enable_x11 just tracks have_x11, 
 ## there's no --enable-x11
@@ -457,8 +453,16 @@ fi
 
 if test x$enable_x11 = xyes ; then
    AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])
+   DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+   DBUS_X_CFLAGS="$X_CFLAGS"
+else
+   DBUS_X_LIBS=
+   DBUS_X_CFLAGS=
 fi
 
+AC_SUBST(DBUS_X_CFLAGS)
+AC_SUBST(DBUS_X_LIBS)
+
 ### Documentation
 
 AC_PATH_PROG(DOXYGEN, doxygen, no)
-- 
cgit