rygel r112 - in trunk: . src

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 21:00:38 2008
New Revision: 112
URL: http://svn.gnome.org/viewvc/rygel?rev=112&view=rev

Log:
Require gio-2.0 (>= 2.16) and include it in the build.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Oct 28 21:00:38 2008
@@ -17,6 +17,7 @@
 GCONF_REQUIRED=2.22
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.18
+GIO_REQUIRED=2.16
 
 PKG_CHECK_MODULES(VALA, [vala-1.0 >= $VALA_REQUIRED])
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
@@ -24,6 +25,7 @@
 PKG_CHECK_MODULES(LIBGCONF, gconf-2.0 >= $GCONF_REQUIRED)
 PKG_CHECK_MODULES(LIBDBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
+PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
 
 # Vala compiler
 # This is more to get the path of the compiler since the pkg-config check
@@ -57,6 +59,10 @@
         true,
         [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-0.10")])
 
+AC_CHECK_FILE("${VAPIDIR}/gio-2.0.vapi",
+        true,
+        [AC_MSG_ERROR("Unable to find Vala bindings for gio-2.0")])
+
 # glib-genmarshal
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct 28 21:00:38 2008
@@ -9,6 +9,7 @@
 	    $(LIBGCONF_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
+	    $(GIO_CFLAGS) \
 	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"'
 
 bin_PROGRAMS = gupnp-media-server
@@ -49,14 +50,15 @@
 gupnp-media-server.stamp: $(filter %.vala,$(gupnp_media_server_SOURCES))
 	$(VALAC) -C --vapidir=$(srcdir) --pkg cstuff --pkg gupnp-1.0 \
 	--pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gconf-2.0 \
-	--pkg gstreamer-0.10 $^
+	--pkg gstreamer-0.10 --pkg gio-2.0 $^
 	touch $@
 
 gupnp_media_server_LDADD = $(LIBGUPNP_LIBS) \
 			   $(LIBGUPNP_AV_LIBS) \
 			   $(LIBGCONF_LIBS) \
 			   $(LIBDBUS_GLIB_LIBS) \
-			   $(LIBGSTREAMER_LIBS)
+			   $(LIBGSTREAMER_LIBS) \
+			   $(GIO_LIBS)
 gupnp_media_server_LDFLAGS = -export-dynamic
 
 CLEANFILES = $(BUILT_SOURCES)