Mercurial > pidgin.yaz
changeset 11070:fdb8ba7a4857
[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>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 08 Jul 2005 05:11:08 +0000 |
| parents | 65db26d0bc90 |
| children | e6b4badef34d |
| files | configure.ac src/Makefile.am |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 = \