build: Make missing gtk-doc non-fatal

[profile/ivi/rygel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3e67688..04ff924 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl Required versions of library packages
 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.20.0
+VALA_REQUIRED=0.22.0
 VALADOC_REQUIRED=0.2
 GSSDP_REQUIRED=0.13.0
 GUPNP_REQUIRED=0.19.0
@@ -361,7 +361,7 @@ dnl This is on by default when using autogen.sh
 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"], [
@@ -369,7 +369,11 @@ 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]))
     ])
@@ -378,7 +382,7 @@ AS_IF([test "x$enable_valadoc" != "xno"], [
 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],