[rhythmbox] depend on a glib version new enough to have GDBus



commit 4d2f6253d8425dbc1353079ca8fce5e15c89933c
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Feb 25 09:04:06 2011 +1000

    depend on a glib version new enough to have GDBus

 configure.ac        |    7 +------
 plugins/Makefile.am |    8 ++------
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8d3ae77..3c44c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ GTK_REQS=2.91.4
 DBUS_MIN_REQS=0.35
 GST_0_10_REQS=0.10.20
 GDK_PIXBUF_REQS=2.18.0
-GLIB_REQS=2.18.0
+GLIB_REQS=2.26.0
 LIBGPOD_REQS=0.6
 MUSICBRAINZ_REQS=2.1.0
 MUSICBRAINZ3_REQS=3.0.2
@@ -59,7 +59,6 @@ LIBSOUP_REQS=2.26.0
 GUDEV_REQS=143
 LIBMTP_REQS=0.3.0
 PYGOBJECT_REQUIRED=2.15.4
-GLIB_GDBUS_REQS=2.25.12
 
 GNOME_MEDIA_PROFILES_REQS=2.91.0
 LIBNOTIFY_REQS=0.5.1
@@ -114,10 +113,6 @@ else
    fi
 fi
 
-dnl check for GDBus
-PKG_CHECK_EXISTS(glib-2.0 >= $GLIB_GDBUS_REQS, [have_gdbus=yes], [have_gdbus=no])
-AM_CONDITIONAL(USE_GDBUS, test x"$have_gdbus" = xyes)
-
 dnl gudev
 AC_ARG_WITH(gudev,
 	    AC_HELP_STRING([--with-gudev],
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 75552da..5cb78c6 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,8 +1,10 @@
 SUBDIRS = 						\
 	audiocd						\
+	dbus-media-server				\
 	generic-player					\
 	iradio						\
 	mmkeys						\
+	mpris						\
 	power-manager					\
 	sample						\
 	status-icon					\
@@ -54,12 +56,6 @@ if ENABLE_FM_RADIO
 SUBDIRS += fmradio
 endif
 
-if USE_GDBUS
-SUBDIRS += 						\
-	dbus-media-server				\
-	mpris
-endif
-
 if ENABLE_LASTFM
 SUBDIRS += audioscrobbler
 endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]