summaryrefslogtreecommitdiffstats
path: root/rules/dbus.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2006-11-26 10:10:49 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2006-11-26 10:10:49 +0000
commit20789137b65d96974a3c887d06fa5fb1f5d52435 (patch)
treec2e328247c6fe3b821947e8ab99e36766cd001ea /rules/dbus.make
parent0bab0306bb0c1cfa01ed5e7855dccdbfb71e4311 (diff)
downloadptxdist-20789137b65d96974a3c887d06fa5fb1f5d52435.tar.gz
ptxdist-20789137b65d96974a3c887d06fa5fb1f5d52435.tar.xz
* dbus: fixed x handling
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6376 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/dbus.make')
-rw-r--r--rules/dbus.make8
1 files changed, 8 insertions, 0 deletions
diff --git a/rules/dbus.make b/rules/dbus.make
index 7a7b0376e..5c9856256 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -62,6 +62,9 @@ DBUS_PATH := PATH=$(CROSS_PATH)
DBUS_ENV := \
$(CROSS_ENV) \
ac_cv_have_abstract_sockets=yes
+ifdef PTXCONF_DBUS_X
+DBUS_ENV += ac_cv_have_x="have_x=yes ac_x_includes=$(SYSROOT)/usr/X11R6/include ac_x_libraries=$(SYSROOT)/usr/X11R6/lib"
+endif
#
# autoconf
@@ -71,6 +74,11 @@ DBUS_AUTOCONF := \
--enable-abstract-sockets=yes \
--localstatedir=/var \
--with-dbus-user=$(PTXCONF_DBUS_USER)
+ifdef PTXCONF_DBUS_X
+DBUS_AUTOCONF += --with-x=$(SYSROOT)/usr/X11R6
+else
+DBUS_AUTOCONF += --without-x
+endif
$(STATEDIR)/dbus.prepare: $(dbus_prepare_deps_default)
@$(call targetinfo, $@)