# HG changeset patch
# User yaz
# Date 1179130254 25200
# Node ID e21a9128e683437ed762561575b7c1b04e421c9e
# Parent  bf2d80abf76e394f6733a83212990cf01efaba3d
[svn] - remove -laudacious from audacious.pc.in. -laudclient will be put into audacious.pc if --enable-dbus is specified.

diff -r bf2d80abf76e -r e21a9128e683 ChangeLog
--- a/ChangeLog	Sun May 13 18:38:53 2007 -0700
+++ b/ChangeLog	Mon May 14 01:10:54 2007 -0700
@@ -1,3 +1,19 @@
+2007-05-14 01:38:53 +0000  Ben Tucker <bnt@interchange.ubc.ca>
+  revision [4564]
+  Implemented CMD_IS_ADVANCE and CMD_TOGGLE_ADVANCE. Added partial MPRIS support. Root is complete, Player is partially implemented, and TrackList has not been started.
+  
+  trunk/src/audacious/Makefile         |    4 -
+  trunk/src/audacious/dbus-service.h   |   43 +++++++++--
+  trunk/src/audacious/dbus.c           |  132 +++++++++++++++++++++++++++++++----
+  trunk/src/audacious/dbus.h           |    4 +
+  trunk/src/audacious/mpris_player.xml |   27 +++++--
+  trunk/src/audacious/objects.xml      |   26 ++++--
+  trunk/src/audacious/ui_main.c        |    6 +
+  trunk/src/audacious/ui_main.h        |    1 
+  trunk/src/libaudclient/audctrl.c     |   21 +++++
+  9 files changed, 226 insertions(+), 38 deletions(-)
+
+
 2007-05-13 18:57:18 +0000  Ben Tucker <bnt@interchange.ubc.ca>
   revision [4562]
   Added a hook when building dependencies so that the dbus-bindings are created first without producing any error messages.
diff -r bf2d80abf76e -r e21a9128e683 audacious.pc.in
--- a/audacious.pc.in	Sun May 13 18:38:53 2007 -0700
+++ b/audacious.pc.in	Mon May 14 01:10:54 2007 -0700
@@ -18,5 +18,5 @@
 Description: Audacious is a versatile and handy multi platform media player
 Version: @PACKAGE_VERSION@
 Requires: @PC_REQUIRES@
-Libs: -L${lib_dir} -laudacious
+Libs: -L${lib_dir} @LIBAUDCLIENT_LDFLAGS@
 Cflags: -I${audacious_include_dir}
diff -r bf2d80abf76e -r e21a9128e683 configure.ac
--- a/configure.ac	Sun May 13 18:38:53 2007 -0700
+++ b/configure.ac	Mon May 14 01:10:54 2007 -0700
@@ -238,6 +238,7 @@
 		DBUS_C=dbus.c
 		DBUS_BINDINGS="dbus-server-bindings.h dbus-client-bindings.h"
 		LIBAUDCLIENT_OBJECTIVE="libaudclient audtool"
+		LIBAUDCLIENT_LDFLAGS="-laudclient"
 		AC_SUBST(DBUS_C)
 		AC_SUBST(DBUS_BINDINGS)
 		AC_SUBST(USE_DBUS)
@@ -246,6 +247,7 @@
 		AC_SUBST(DBUS_SERVICES_DIR)
 		AC_SUBST(DBUS_BINDING_TOOL)
 		AC_SUBST(LIBAUDCLIENT_OBJECTIVE)
+		AC_SUBST(LIBAUDCLIENT_LDFLAGS)
 	fi
 fi
 
diff -r bf2d80abf76e -r e21a9128e683 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Sun May 13 18:38:53 2007 -0700
+++ b/src/audacious/build_stamp.c	Mon May 14 01:10:54 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070513-4562";
+const gchar *svn_stamp = "20070514-4564";