dnl Not all of these are actually used, depending on the configure options.
GLIB_REQUIRED=2.31.13
LIBXML_REQUIRED=2.7
-VALA_REQUIRED=0.18.0
+VALA_REQUIRED=0.22.0
VALADOC_REQUIRED=0.2
GSSDP_REQUIRED=0.13.0
GUPNP_REQUIRED=0.19.0
GEE_REQUIRED=0.8.0
UUID_REQUIRED=1.41.3
LIBSOUP_REQUIRED=2.34.0
-GTK_REQUIRED=2.90.3
+GTK_REQUIRED=3.0
dnl Additional requirements for media-export plugin
GSTREAMER_TAG_REQUIRED=1.0
gstreamer-app-1.0 >= $GSTREAMER_APP_REQUIRED
gstreamer-tag-1.0 >= $GSTREAMER_TAG_REQUIRED
gstreamer-pbutils-1.0 >= $GSTPBU_REQUIRED
+ libsoup-2.4 >= $LIBSOUP_REQUIRED
sqlite3 >= $LIBSQLITE3_REQUIRED
uuid])
RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gupnp-dlna-2.0 --pkg gupnp-dlna-gst-2.0 --pkg gstreamer-tag-1.0 --pkg gstreamer-app-1.0 --pkg gstreamer-pbutils-1.0 --pkg sqlite3"
[have_unistring=yes],[have_unistring=no]))
if test "x$have_unistring" = "xyes"; then
AC_DEFINE([HAVE_UNISTRING],[1],[Use libunistring for collation])
- COLLATION_CFLAGS=
- COLLATION_LIBS=-lunistring
- AC_SUBST([COLLATION_CFLAGS])
- AC_SUBST([COLLATION_LIBS])
+ RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS="$RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS -lunistring"
fi
fi
dnl (so it is not on by default when building from a tarball with configure.)
AC_ARG_ENABLE(valadoc,
AS_HELP_STRING([--enable-valadoc[=@<:@no/auto/yes@:>@]], [Enable valadoc support]),,
- [enable_valadoc=no])
+ [enable_valadoc=auto])
found_valadoc=no
AS_IF([test "x$enable_valadoc" != "xno"], [
AS_IF([test -x "$VALADOC"], [
found_valadoc=yes
AC_SUBST(VALADOC)
- PKG_CHECK_MODULES([GTKDOC],[gtk-doc >= 1.0])
+ PKG_CHECK_MODULES([GTKDOC],[gtk-doc >= 1.0],,
+ AS_IF([test "x$enable_valadoc" == "xyes"],
+ [AC_MSG_ERROR([Unable to find gtk-doc])],
+ [found_valadoc=no])
+ )
], [
AS_IF([test "x$enable_valadoc" == "xyes"], AC_MSG_ERROR([Unable to find valadoc]))
])
AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
- ["-shared -fPIC -module -avoid-version -Wl,-z,defs"])
+ ["-module -avoid-version -Wl,-z,defs"])
AC_SUBST([RYGEL_PLUGIN_DIR],
[${libdir}/rygel-2.0/plugins])
AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
src/ui/Makefile
src/media-engines/Makefile
src/media-engines/gstreamer/Makefile
+src/media-engines/gstreamer/media-engine-gst.plugin
src/media-engines/simple/Makefile
+src/media-engines/simple/media-engine-simple.plugin
src/plugins/Makefile
data/Makefile
data/xml/Makefile
examples/Makefile
examples/renderer-plugins/Makefile
examples/renderer-plugins/vala/Makefile
+examples/renderer-plugins/vala/example-renderer-vala.plugin
examples/renderer-plugins/C/Makefile
+examples/renderer-plugins/C/example-renderer-c.plugin
examples/server-plugins/Makefile
examples/server-plugins/vala/Makefile
+examples/server-plugins/vala/example-server-vala.plugin
examples/server-plugins/C/Makefile
+examples/server-plugins/C/example-server-c.plugin
])
AC_OUTPUT