[Xfce4-commits] <ristretto:master> Update documentation sub-package and configure.in.in

[Stephan Arts]

Updating branch refs/heads/master
         to 904486fd6af85e2873db667e127d9b6a7ab4517f (commit)
       from 67fa0670d401adf01208e56a3f68ea0bdc6a3c15 (commit)

commit 904486fd6af85e2873db667e127d9b6a7ab4517f
Author: Stephan Arts <stephan at xfce.org>
Date:   Thu Oct 27 17:57:52 2011 +0200

    Update documentation sub-package and configure.in.in

 .gitmodules     |    3 +++
 autogen.sh      |    1 +
 configure.in.in |   42 +++++++++++++++++++++++++++++-------------
 docs            |    1 +
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..10e4aa0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docs"]
+	path = docs
+	url = git://git.xfce.org/xfce/xfce4-docs
diff --git a/autogen.sh b/autogen.sh
index 819932d..a5c8683 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,6 +10,7 @@
 #
 
 export XDT_AUTOGEN_REQUIRED_VERSION="4.8.0"
+export XDT_AUTOGET_CHECK_DOCS="docs"
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
diff --git a/configure.in.in b/configure.in.in
index d94414e..3b7bfb4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -70,17 +70,34 @@ XDT_CHECK_LIBX11()
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
-dnl **************************
-dnl *** Check for xsltproc ***
-dnl **************************
-AC_ARG_ENABLE([xsltproc], [AC_HELP_STRING([--enable-xsltproc], [Use xsltproc to build documentation @<:@default=no@:>@])],, [enable_xsltproc=no])
-if test x"$enable_xsltproc" = x"yes"; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc], [no])
-  if test x"$XSLTPROC" = x"no"; then
-    enable_xsltproc=no
-  fi
+dnl *******************************
+dnl *** Check for documentation ***
+dnl *******************************
+AC_ARG_ENABLE([gen-doc], [AC_HELP_STRING([--enable-gen-doc],
+              [Generate HTML documentation (requires gnome-doc-utils) [default=no]])],,
+              [enable_gen_doc=no])
+if test x"$enable_gen_doc" = x"yes"; then
+    XDT_CHECK_PACKAGE([GNOME_DOC_UTILS], [gnome-doc-utils], [0.19.2],
+    [
+        AC_PATH_PROG([ITSTOOL], [itstool], [no])
+        if test x"$ITSTOOL" = x"no"; then
+            enable_gen_doc=no
+        fi
+
+        AC_PATH_PROG([GNOME_DOC_TOOL], [gnome-doc-tool], [no])
+        if test x"$GNOME_DOC_TOOL" = x"no"; then
+            enable_gen_doc=no
+        fi
+    ],
+    [
+        enable_gen_doc=no
+    ])
+
+    if test x"$enable_gen_doc" = x"no"; then
+        AC_MSG_ERROR([Compiling with --enable-gen-doc but no suitable gnome-doc-utils found.])
+    fi
 fi
-AM_CONDITIONAL([ENABLE_XSLTPROC], [test x"$enable_xsltproc" = x"yes"])
+AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
 
 
 
@@ -93,9 +110,8 @@ po/Makefile.in
 src/Makefile
 docs/Makefile
 docs/manual/Makefile
-docs/manual/C/Makefile
-docs/manual/C/ristretto.xml
-docs/manual/C/images/Makefile
+docs/manual/po/Makefile
+docs/manual/media/Makefile
 icons/Makefile
 icons/16x16/Makefile
 icons/22x22/Makefile
diff --git a/docs b/docs
new file mode 160000
index 0000000..f18e230
--- /dev/null
+++ b/docs
@@ -0,0 +1 @@
+Subproject commit f18e230cee8cff47e5d9da8d276abadc5668b130