[rygel] build: Do not require valadoc in tarball builds

[Murray Cumming <murrayc src gnome org>]

commit 8ec8b7150aa8fa2f24bd86786d23513d07391a2d
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 10 09:29:39 2012 +0200

    build: Do not require valadoc in tarball builds
    
    * configure.ac: Default --enable-valadoc to no.
    * autogen.sh: Specify --enable-valadoc=yes here, as we already
      enable vala.
    * Makefile.am: Remove --enable-valadoc from
      DISTCHECK_CONFIGURE_FLAGS
    * doc/reference/doc-build.am: Move the ifdef around so that
      the html is always installed.

 Makefile.am                |    3 +--
 autogen.sh                 |    2 +-
 configure.ac               |    4 +++-
 doc/reference/doc-build.am |   17 ++++++++++++-----
 4 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0130c06..2a51975 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 EXTRA_DIST = rygel-core-2.0.pc.in rygel-renderer-2.0.pc.in \
              rygel-server-2.0.pc.in .version
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc \
-                            --enable-valadoc
+DISTCHECK_CONFIGURE_FLAGS =
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in
diff --git a/autogen.sh b/autogen.sh
index a7ce2fa..6c37024 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ REQUIRED_AUTOMAKE_VERSION=1.11 \
 REQUIRED_AUTOCONF_VERSION=2.64 \
 REQUIRED_LIBTOOL_VERSION=2.2.6 \
 REQUIRED_INTLTOOL_VERSION=0.40.0 \
-bash gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
+bash gnome-autogen.sh --enable-vala --enable-valadoc --enable-maintainer-mode --enable-debug \
                  --enable-tests --enable-test-plugin \
                  --enable-mediathek-plugin --enable-gst-launch-plugin \
                  --enable-strict-valac "$@"
diff --git a/configure.ac b/configure.ac
index 6b9bbcf..a3e24c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,9 +247,11 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 AM_CONDITIONAL([HAVE_XSLTPROC], [test x"$XSLTPROC" != x])
 
 dnl Use valadoc for API documentation:
+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=auto])
+    [enable_valadoc=no])
 
 found_valadoc=no
 AS_IF([test "x$enable_valadoc" != "xno"], [
diff --git a/doc/reference/doc-build.am b/doc/reference/doc-build.am
index 3812798..46ac7a6 100644
--- a/doc/reference/doc-build.am
+++ b/doc/reference/doc-build.am
@@ -11,7 +11,12 @@ valadoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS)
 		-o valadoc \
 		$(VALADOC_FLAGS)
 
-gtkdoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml
+# Avoid regeneration of the html if none of its dependencies have changed:
+gtkdoc/html/index.html: gtkdoc-gen
+
+RYGEL_GTKDOC_DOCS_XML = $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml
+
+gtkdoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) $(RYGEL_GTKDOC_DOCS_XML)
 	@rm -rf gtkdoc/html
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_srcdir)/src/lib$(RYGEL_DOCBUILD_MODULE)/$(RYGEL_DOCBUILD_MODULE).h \
@@ -38,14 +43,16 @@ clean-local:
 uninstall-hook:
 	rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
 
+all: valadoc-gen gtkdoc-gen
+
+endif
+
 # The chmod corrects the directory permissions so that distcheck can remove the installed files.
-install-data-hook: gtkdoc-gen
+install-data-hook: gtkdoc/html/index.html
 	$(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
 	cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
 	chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
 
-all: valadoc-gen gtkdoc-gen
 
-EXTRA_DIST = gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml gtkdoc/html valadoc
+EXTRA_DIST = $(RYGEL_GTKDOC_DOCS_XML) gtkdoc/html valadoc
 
-endif