[Xfce4-commits] <ristretto:master> Remove docs submodule

[Stephan Arts]

Updating branch refs/heads/master
         to 30031ef8f300ee2e6b8a1df2ab18fdcbe6328949 (commit)
       from 6ff4e7779f0c867dc01a81c5b651fe59bd2d29d8 (commit)

commit 30031ef8f300ee2e6b8a1df2ab18fdcbe6328949
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Jan 8 13:25:21 2012 +0100

    Remove docs submodule
    
     - (see xfce4-dev m/l about details regarding docs.xfce.org)

 .gitmodules     |    3 ---
 Makefile.am     |    2 +-
 configure.in.in |   40 ----------------------------------------
 docs            |    1 -
 4 files changed, 1 insertions(+), 45 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 10e4aa0..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "docs"]
-	path = docs
-	url = git://git.xfce.org/xfce/xfce4-docs
diff --git a/Makefile.am b/Makefile.am
index ba1a733..7dada84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src po icons docs
+SUBDIRS = src po icons
 
 desktopdir = $(datadir)/applications
 desktop_in_files = ristretto.desktop.in
diff --git a/configure.in.in b/configure.in.in
index d77635c..2cd9f23 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -72,42 +72,6 @@ XDT_CHECK_LIBX11()
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
-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
-
-        AC_PATH_PROG([XML2PO], [xml2po], [no])
-        if test x"$XML2PO" = 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([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
-
-
-
 dnl check for debugging support
 XDT_FEATURE_DEBUG
 
@@ -115,10 +79,6 @@ AC_OUTPUT([
 Makefile
 po/Makefile.in
 src/Makefile
-docs/Makefile
-docs/manual/Makefile
-docs/manual/po/Makefile
-docs/manual/media/Makefile
 icons/Makefile
 icons/16x16/Makefile
 icons/22x22/Makefile
diff --git a/docs b/docs
deleted file mode 160000
index 73b0800..0000000
--- a/docs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73b080051221a9e960796b0917768982fe85567f