summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-03-24 15:44:43 +0000
committerColin Walters <walters@verbum.org>2005-03-24 15:44:43 +0000
commitc3492190e713e9db579f49b13da7d2a537a75240 (patch)
tree005986cb828b21d42c029cdc0096d1e12fcd072e
parent4bbafebfdbe5ad252e806b63026d301cf0067786 (diff)
2005-03-24 Daniel Reed <n@ml.org>
* tools/Makefile.am: Make print-introspect and dbus-bus-introspect.xml building conditional on HAVE_GLIB.
-rw-r--r--ChangeLog5
-rw-r--r--tools/Makefile.am2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 60c1fa0b..80f8ade5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-24 Daniel Reed <n@ml.org>
+
+ * tools/Makefile.am: Make print-introspect and
+ dbus-bus-introspect.xml building conditional on HAVE_GLIB.
+
2005-03-22 John (J5) Palmieri <johnp@redhat.com>
* tools/Makefile.am: Patch by Colin Walters that fixes distcheck
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d1b490c7..333d89d1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,6 +21,7 @@ else
GTK_TOOLS=
endif
+if HAVE_GLIB
noinst_PROGRAMS = print-introspect
print_introspect_SOURCES = print-introspect.c
@@ -28,6 +29,7 @@ print_introspect_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch print-introspect $(top_builddir)/bus/dbus-daemon
DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./print-introspect org.freedesktop.DBus /org/freedesktop/DBus > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+endif
bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)