changeset 2724:88b39b1d9b7b trunk

[svn] Fix build without --enable-dbus -- this will render an audacious which is not remote-controllable (the buggy controlsocket code has been removed in a prior build), but makes our dependency on dbus optional. When built without dbus, MPRIS support is also disabled (as it needs D-Bus).
author nenolod
date Wed, 09 May 2007 21:16:57 -0700
parents 5051af882447
children 2f638e729d9e
files ChangeLog configure.ac mk/rules.mk.in src/Makefile src/audacious/build_stamp.c
diffstat 5 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 09 17:14:46 2007 -0700
+++ b/ChangeLog	Wed May 09 21:16:57 2007 -0700
@@ -1,3 +1,12 @@
+2007-05-10 00:14:46 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4472]
+  - bind to the right dbus interfaces, but this still has problems building
+  
+  trunk/src/audtool/audtool.c |  180 +++++++++++++++++++++++++-------------------
+  trunk/src/audtool/audtool.h |  124 +++++++++++++++---------------
+  2 files changed, 166 insertions(+), 138 deletions(-)
+
+
 2007-05-09 23:43:29 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [4470]
   MCS_LIBS != LIBMCS_LIBS, allow audacious binary to link.
--- a/configure.ac	Wed May 09 17:14:46 2007 -0700
+++ b/configure.ac	Wed May 09 21:16:57 2007 -0700
@@ -237,6 +237,7 @@
 			[Location of D-Bus services directory])
 		DBUS_C=dbus.c
 		DBUS_BINDINGS="dbus-server-bindings.h dbus-client-bindings.h"
+		LIBAUDCLIENT_OBJECTIVE="libaudclient"
 		AC_SUBST(DBUS_C)
 		AC_SUBST(DBUS_BINDINGS)
 		AC_SUBST(USE_DBUS)
@@ -244,6 +245,7 @@
 		AC_SUBST(DBUS_LIBS)
 		AC_SUBST(DBUS_SERVICES_DIR)
 		AC_SUBST(DBUS_BINDING_TOOL)
+		AC_SUBST(LIBAUDCLIENT_OBJECTIVE)
 	fi
 fi
 
--- a/mk/rules.mk.in	Wed May 09 17:14:46 2007 -0700
+++ b/mk/rules.mk.in	Wed May 09 21:16:57 2007 -0700
@@ -336,3 +336,4 @@
 LIBMCS_LIBS ?= @LIBMCS_LIBS@
 MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
 MOWGLI_LIBS ?= @MOWGLI_LIBS@
+LIBAUDCLIENT_OBJECTIVE ?= @LIBAUDCLIENT_OBJECTIVE@
--- a/src/Makefile	Wed May 09 17:14:46 2007 -0700
+++ b/src/Makefile	Wed May 09 21:16:57 2007 -0700
@@ -3,7 +3,7 @@
 include ../mk/rules.mk
 include ../mk/init.mk
 
-SUBDIRS = $(INTL_OBJECTIVE) $(SUBDIR_GUESS) audacious libaudclient libid3tag
+SUBDIRS = $(INTL_OBJECTIVE) $(SUBDIR_GUESS) audacious libid3tag $(LIBAUDCLIENT_OBJECTIVE)
 
 include ../mk/objective.mk
 
--- a/src/audacious/build_stamp.c	Wed May 09 17:14:46 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed May 09 21:16:57 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070509-4470";
+const gchar *svn_stamp = "20070510-4472";