Mercurial > pidgin3 / changeset

--- a/configure.ac	Tue Jul 12 04:27:11 2005 +0000
+++ b/configure.ac	Tue Jul 12 05:30:23 2005 +0000
@@ -324,6 +324,11 @@
 	[
 		enable_dbus=no
 	])
+	AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+	if test x$DBUS_BINDING_TOOL = "xno" ; then
+		AC_MSG_WARN([dbus-binding-tool executable not found in your path])
+		enable_dbus=no
+	fi
 fi
 
 if test "x$enable_dbus" = "xyes"; then

--- a/src/Makefile.am	Tue Jul 12 04:27:11 2005 +0000
+++ b/src/Makefile.am	Tue Jul 12 05:30:23 2005 +0000
@@ -146,8 +146,8 @@
 
 if ENABLE_DBUS
 
-gaim_coresources  += dbus-server.c 
-gaim_coreheaders  += dbus-server.h
+dbus_sources = dbus-server.c  
+dbus_headers  = dbus-server.h
 
 # do not use gaim-client, use gaim-send instead
 # bin_PROGRAMS      += gaim-client
@@ -168,6 +168,7 @@
 
 gaim_SOURCES = \
 	$(gaim_coresources) \
+	$(dbus_sources) \
 	gtkcombobox.c \
 	gtkcelllayout.c \
 	gtkcellview.c \
@@ -206,6 +207,7 @@
 	session.c
 
 gaim_headers = \
+	$(dbus_headers) \
 	gaim.h \
 	gtkcombobox.h \
 	gtkcelllayout.h \