[vhffs-dev] [1430] Removing references to doc in makefiles

[subversion@xxxxxxxxxxxxx]

Revision: 1430
Author:   beuss
Date:     2009-06-12 11:57:20 +0200 (Fri, 12 Jun 2009)

Log Message:
-----------
Removing references to doc in makefiles

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-06-12 09:55:55 UTC (rev 1429)
+++ trunk/Makefile.am	2009-06-12 09:57:20 UTC (rev 1430)
@@ -2,13 +2,13 @@
 
 SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-doc --enable-panel --enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
+DISTCHECK_CONFIGURE_FLAGS = --enable-panel --enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
 
 if INSTALL_VHFFS_FS 
   SUB_VHFFS_FS=vhffs-fs
 endif
 
-SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
+SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
 	vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-tests vhffs-themes vhffs-tools
 
 EXTRA_DIST = config.rpath m4/ChangeLog vhffs-forum vhffs-irc

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-06-12 09:55:55 UTC (rev 1429)
+++ trunk/configure.ac	2009-06-12 09:57:20 UTC (rev 1430)
@@ -54,15 +54,6 @@
 )
 AC_SUBST(TOOLSDIR)
 
-dnl Documentation
-AC_ARG_WITH(doc-path,
-	AC_HELP_STRING([--with-doc-path=path],
-		[Complete path for documentation files (/usr/share/doc/vhffs)]),
-	DOCDIR=$withval,
-	DOCDIR=${prefix}/share/doc/vhffs
-)
-AC_SUBST(DOCDIR)
-
 dnl perl modules
 AC_ARG_WITH(api-path,
     AC_HELP_STRING([--with-api-path=path],
@@ -136,15 +127,6 @@
 )
 AC_SUBST(LEDIR)
 
-dnl documentation
-AC_ARG_WITH(doc-path,
-	AC_HELP_STRING([--with-doc-path=path],
-		[Complete path for documentation files (/usr/share/doc/vhffs)]),
-	DOCSDIR=$withval,
-	DOCSDIR=${prefix}/share/doc/vhffs
-)
-AC_SUBST(DOCSDIR)
-
 dnl Compatibility stuff
 
 AC_ARG_WITH(compat-path,
@@ -175,20 +157,7 @@
 
 dnl Modular build (if someone wants to improve...)
 
-#TODO add format/language handling
-AC_ARG_ENABLE(doc,
-    AC_HELP_STRING([--enable-doc],
-        [Enable vhffs documentation, need DocBook and xsltproc[default=no]]))
 
-AM_CONDITIONAL(BUILD_DOC, test "$enable_doc" = yes)
-
-if test "$enable_doc" = "yes"; then
-    AC_PATH_PROG([XSLTPROC], [xsltproc], [none])
-    if test "x$XSLTPROC" = xnone; then
-        AC_MSG_ERROR([You need xsltproc script to build the documentation])
-    fi
-fi
-
 dnl Install panel or not ?
 AC_ARG_ENABLE(panel,
     AC_HELP_STRING([--enable-panel],
@@ -304,7 +273,6 @@
 	vhffs-backend/Makefile
 	vhffs-backend/src/Makefile
 	vhffs-compat/Makefile
-	vhffs-doc/Makefile
 	vhffs-jabber/Makefile
 	vhffs-listengine/Makefile
 	vhffs-listengine/src/Makefile