# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1120799468 0
# Node ID fdb8ba7a4857744d21750aa19c746e21196b322a
# Parent  65db26d0bc90f7827f3172d2850760b0b282d5fc
[gaim-migrate @ 13069]
I (apparently) don't have dbus. configure still needs to work.

I'm also fixing some warnings with src/Makefile.am introduced by the dbus commits.

committer: Tailor Script <tailor@pidgin.im>

diff -r 65db26d0bc90 -r fdb8ba7a4857 configure.ac
--- a/configure.ac	Fri Jul 08 03:54:31 2005 +0000
+++ b/configure.ac	Fri Jul 08 05:11:08 2005 +0000
@@ -319,7 +319,8 @@
    	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.34 dbus-glib-1 >= 0.34],
 	[
 		AC_SUBST(DBUS_CFLAGS)
-		AC_SUBST(DBUS_LIBS)   	
+		AC_SUBST(DBUS_LIBS)
+		enable_dbus=yes
 	],
 	[
 		enable_dbus=no
diff -r 65db26d0bc90 -r fdb8ba7a4857 src/Makefile.am
--- a/src/Makefile.am	Fri Jul 08 03:54:31 2005 +0000
+++ b/src/Makefile.am	Fri Jul 08 05:11:08 2005 +0000
@@ -150,7 +150,10 @@
 gaim_coreheaders  += dbus-server.h
 
 # do not use gaim-client, use gaim-send instead
-# bin_PROGRAMS      += gaim-client  
+# bin_PROGRAMS      += gaim-client
+#gaim_client_SOURCES      = dbus-client.c
+#gaim_client_DEPENDENCIES = @LIBOBJS@
+#gaim_client_LDADD        = @LIBOBJS@ $(GLIB_LIBS) $(DBUS_LIBS) $(INTLLIBS)
 
 dbus-client-bindings.c: dbus-service.xml
 	dbus-binding-tool --prefix=gaim_object --mode=glib-client --output=$@ $<
@@ -161,10 +164,6 @@
 dbus-client.$(OBJEXT): dbus-client-bindings.c
 dbus-server.$(OBJEXT): dbus-server-bindings.c
 
-gaim_client_SOURCES      = dbus-client.c
-gaim_client_DEPENDENCIES = @LIBOBJS@
-gaim_client_LDADD        = @LIBOBJS@ $(GLIB_LIBS) $(DBUS_LIBS) $(INTLLIBS) 
-
 endif
 
 gaim_SOURCES = \