From: Colin Walters Date: Thu, 24 Mar 2005 15:44:43 +0000 (+0000) Subject: 2005-03-24 Daniel Reed X-Git-Tag: dbus-0.32.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3492190e713e9db579f49b13da7d2a537a75240;p=thirdparty%2Fdbus.git 2005-03-24 Daniel Reed * tools/Makefile.am: Make print-introspect and dbus-bus-introspect.xml building conditional on HAVE_GLIB. --- diff --git a/ChangeLog b/ChangeLog index 60c1fa0b1..80f8ade5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-24 Daniel Reed + + * tools/Makefile.am: Make print-introspect and + dbus-bus-introspect.xml building conditional on HAVE_GLIB. + 2005-03-22 John (J5) Palmieri * tools/Makefile.am: Patch by Colin Walters that fixes distcheck diff --git a/tools/Makefile.am b/tools/Makefile.am index d1b490c7b..333d89d1a 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)