[rygel] build: Fix librygel-ruih linking

[Jens Georg <jensgeorg src gnome org>]

commit 339738aa7645a586ff91fcf66527fb2f27dbf3ac
Author: Jens Georg <mail jensge org>
Date:   Sat May 9 23:39:52 2015 +0200

    build: Fix librygel-ruih linking
    
    Signed-off-by: Jens Georg <mail jensge org>

 configure.ac                  |    9 +++++++++
 src/librygel-ruih/Makefile.am |    6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a38a8ad..138e3f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,14 @@ PKG_CHECK_MODULES([LIBRYGEL_RENDERER_DEPS], [$RYGEL_COMMON_MODULES gio-2.0 >= $G
 LIBRYGEL_RENDERER_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg libsoup-2.4"
 AC_SUBST([LIBRYGEL_RENDERER_DEPS_VALAFLAGS])
 
+PKG_CHECK_MODULES([LIBRYGEL_RUIH_DEPS],
+                  [$RYGEL_COMMON_MODULES
+                   gio-2.0 >= $GIO_REQUIRED
+                   gee-0.8 >= $GEE_REQUIRED
+                   libxml-2.0 >= $LIBXML_REQUIRED])
+LIBRYGEL_RUIH_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg gee-0.8 --pkg libxml2"
+AC_SUBST([LIBRYGEL_RUIH_DEPS_VALAFLAGS])
+
 PKG_CHECK_MODULES([RYGEL_DEPS], [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED gssdp-1.0 >= 
$GSSDP_REQUIRED])
 
 # Not all tests use all of these dependencies,
@@ -511,4 +519,5 @@ echo "
         MPRIS2:                 ${enable_mpris_plugin}
         gst-launch:             ${enable_gst_launch_plugin}
         playbin:                ${enable_playbin_plugin}
+        RUIH plugin:            ${enable_ruih_plugin}
 "
diff --git a/src/librygel-ruih/Makefile.am b/src/librygel-ruih/Makefile.am
index bc581ac..5a7d5a3 100644
--- a/src/librygel-ruih/Makefile.am
+++ b/src/librygel-ruih/Makefile.am
@@ -1,4 +1,4 @@
-include ../../common.am
+include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
 librygel_ruih_includedir=$(includedir)/rygel-2.6
@@ -19,10 +19,10 @@ librygel_ruih_2_0_la_VALAFLAGS = \
         $(RYGEL_COMMON_VALAFLAGS)
 
 librygel_ruih_2_0_la_CFLAGS = \
-        $(LIBRYGEL_SERVER_DEPS_CFLAGS) \
+        $(LIBRYGEL_RUIH_DEPS_CFLAGS) \
         $(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
-        -DENGINE_DIR='"$(enginedir)"' \
         -DG_LOG_DOMAIN=\"RygelRuih\"
+
 librygel_ruih_2_0_la_LIBADD = \
         $(LIBRYGEL_RUIH_DEPS_LIBS) \
         $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)