diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/librygel-ruih/Makefile.am | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index a38a8ada..138e3f3f 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 bc581ac4..5a7d5a3b 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) |