Updating branch refs/heads/master to 9884628d26976afe1c676a0d25c107aa48e5c5d3 (commit) from faeda9c473b612d0ad879e15f304673b595dc4fc (commit)
commit 9884628d26976afe1c676a0d25c107aa48e5c5d3 Author: Brian J. Tarricone <br...@tarricone.org> Date: Wed Oct 28 22:52:56 2009 -0700 add configure check for dbus-binding-tool Makefile.am | 4 ++-- configure.ac.in | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e835800..7310806 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,10 +156,10 @@ DISTCLEANFILES = \ xfce4-notifyd/notify-dbus.h: $(srcdir)/xfce4-notifyd/notify-dbus.xml Makefile if USE_OLD_GET_SERVER_INFORMATION_SIGNATURE sed -e 's,<arg direction="out" name="spec_version" type="s"/>,,' $< > $(<F).tmp - dbus-binding-tool --mode=glib-server --prefix=notify $(<F).tmp > $@ + $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $(<F).tmp > $@ rm -f $(<F).tmp else - dbus-binding-tool --mode=glib-server --prefix=notify $< > $@ + $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $< > $@ endif if MAINTAINER_MODE diff --git a/configure.ac.in b/configure.ac.in index 255ea2a..6058490 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -60,6 +60,13 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSEXY], [libsexy], [0.1.6], [libsexy], [libsexy support (for clickable URLs) (default=yes)], [yes]) +AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool]) +AS_IF([test -z "$DBUS_BINDING_TOOL"], +[ + echo '*** The program "dbus-binding-tool" is required to build.' + exit 1 +]) + AS_IF([test "x$USE_MAINTAINER_MODE" = "xyes"], [ AC_PATH_PROG([EXO_CSOURCE], [exo-csource]) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits