Link against libgee.

svn path=/trunk/; revision=294

diff --git a/configure.ac b/configure.ac
index 062117b..fe0aefc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ GCONF_REQUIRED=2.22
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.18
 GIO_REQUIRED=2.16
+GEE_REQUIRED=0.1.3
 
 PKG_CHECK_MODULES(VALA, [vala-1.0 >= $VALA_REQUIRED])
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
@@ -29,6 +30,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)
+PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
 
 # Vala compiler
 # This is more to get the path of the compiler since the pkg-config check
@@ -66,6 +68,10 @@ AC_CHECK_FILE("${VAPIDIR}/gio-2.0.vapi",
         true,
         [AC_MSG_ERROR("Unable to find Vala bindings for gio-2.0")])
 
+AC_CHECK_FILE("${VAPIDIR}/gee-1.0.vapi",
+        true,
+        [AC_MSG_ERROR("Unable to find Vala bindings for gee-1.0")])
+
 # glib-genmarshal
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)

diff --git a/src/media-providers/tracker/Makefile.am b/src/media-providers/tracker/Makefile.am
index 1e45272..b39e7bf 100644 (file)
--- a/src/media-providers/tracker/Makefile.am
+++ b/src/media-providers/tracker/Makefile.am
@@ -5,6 +5,7 @@ plugin_LTLIBRARIES = librygel-media-tracker.la
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGUPNP_AV_CFLAGS) \
            $(LIBDBUS_GLIB_CFLAGS) \
+           $(GEE_CFLAGS) \
            -I$(top_srcdir)/src/media-server
 
 BUILT_SOURCES = rygel-media-tracker.stamp \
@@ -48,12 +49,13 @@ librygel_media_tracker_la_SOURCES = rygel-media-tracker.h \
 rygel-media-tracker.stamp: $(filter %.vala,$(librygel_media_tracker_la_SOURCES))
        $(VALAC) -C --vapidir=$(top_srcdir)/src/media-server \
        --pkg rygel-1.0 \
-       --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 $^
+       --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gee-1.0 $^
        touch $@
 
 librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
                                   $(LIBGUPNP_AV_LIBS) \
-                                  $(LIBDBUS_GLIB_LIBS)
+                                  $(LIBDBUS_GLIB_LIBS) \
+                                  $(GEE_LIBS)
 librygel_media_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/src/media-server/Makefile.am b/src/media-server/Makefile.am
index eca1f31..b250388 100644 (file)
--- a/src/media-server/Makefile.am
+++ b/src/media-server/Makefile.am
@@ -15,6 +15,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGCONF_CFLAGS) \
            $(LIBGSTREAMER_CFLAGS) \
            $(GIO_CFLAGS) \
+           $(GEE_CFLAGS) \
            -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' \
            -DPLUGIN_DIR='"$(plugindir)"'
 
@@ -85,14 +86,15 @@ rygel_SOURCES = rygel-1.0.vapi \
 rygel.stamp: $(filter %.vala,$(rygel_SOURCES))
        $(VALAC) -C --vapidir=$(srcdir) --pkg rygel-1.0 \
        --pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-       --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 $^
+       --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 $^
        touch $@
 
 rygel_LDADD = $(LIBGUPNP_LIBS) \
              $(LIBGUPNP_AV_LIBS) \
              $(LIBGCONF_LIBS) \
              $(LIBGSTREAMER_LIBS) \
-             $(GIO_LIBS)
+             $(GIO_LIBS) \
+             $(GEE_LIBS)
 rygel_LDFLAGS = -export-dynamic
 
 VAPI_FILES = rygel-1.0.vapi
@@ -106,7 +108,7 @@ rygel-1.0.vapi: rygel-content-directory.vala \
                rygel-media-container.vala \
                rygel-media-item.vala
        $(VALAC) -C --library=rygel-1.0 \
-       --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
+       --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0 \
        $^
 
 CLEANFILES = $(BUILT_SOURCES)