build: Require & link against gst-plugins-base
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Tue, 22 Mar 2011 14:11:49 +0000 (16:11 +0200)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Sat, 26 Mar 2011 14:05:12 +0000 (16:05 +0200)
common.am
configure.ac
src/rygel/Makefile.am
tests/Makefile.am

index 8b5c855..695a933 100644 (file)
--- a/common.am
+++ b/common.am
@@ -24,6 +24,7 @@ AM_CFLAGS = \
        $(LIBGUPNP_CFLAGS) \
        $(LIBGUPNP_AV_CFLAGS) \
        $(LIBGSTREAMER_CFLAGS) \
+       $(GSTREAMER_BASE_CFLAGS) \
        $(GEE_CFLAGS) \
        $(UUID_CFLAGS) \
        -I$(rygeldir) \
@@ -35,6 +36,7 @@ RYGEL_COMMON_LDADD = \
        $(LIBGUPNP_LIBS) \
        $(LIBGUPNP_AV_LIBS) \
        $(LIBGSTREAMER_LIBS) \
+       $(GSTREAMER_BASE_LIBS) \
        $(GEE_LIBS) \
        $(UUID_LIBS)
 
index 8fa6596..75b1e81 100644 (file)
@@ -61,6 +61,7 @@ PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED
 PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED
                                  gupnp-dlna-1.0 <= $GUPNP_DLNA_MAX_VERSION)
 PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
+PKG_CHECK_MODULES(GSTREAMER_BASE, gstreamer-base-0.10 >= $GSTREAMER_REQUIRED)
 PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
 PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
 PKG_CHECK_MODULES(UUID, uuid >= $UUID_REQUIRED)
index a55788c..19a126c 100644 (file)
@@ -114,6 +114,7 @@ rygel_VALAFLAGS = \
        -H rygel.h -C --library=rygel-1.0 \
        --pkg rygel-misc \
        --pkg gstreamer-0.10 \
+       --pkg gstreamer-base-0.10 \
        --pkg gupnp-dlna-1.0 \
        --pkg posix \
        $(RYGEL_COMMON_VALAFLAGS)
index 383768f..0577d8e 100644 (file)
@@ -3,6 +3,7 @@ shareddir = $(abs_top_builddir)/data
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGUPNP_AV_CFLAGS) \
            $(LIBGSTREAMER_CFLAGS) \
+           $(GSTREAMER_BASE_CFLAGS) \
            $(GIO_CFLAGS) \
            $(GEE_CFLAGS) \
            $(UUID_CFLAGS) \
@@ -13,6 +14,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 LDADD = $(LIBGUPNP_LIBS) \
        $(LIBGUPNP_AV_LIBS) \
        $(LIBGSTREAMER_LIBS) \
+       $(GSTREAMER_BASE_LIBS) \
        $(GIO_LIBS) \
        $(GEE_LIBS) \
        $(UUID_LIBS) \
@@ -20,7 +22,7 @@ LDADD = $(LIBGUPNP_LIBS) \
 
 AM_VALAFLAGS = --disable-warnings --thread \
               --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-               --pkg gconf-2.0 --pkg gstreamer-0.10 \
+               --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
                --pkg gio-2.0 --pkg gee-1.0 -g
 
 check_PROGRAMS = rygel-http-item-uri-test \