[PATCH app-xfs] doc: use new macros to control doc generation

[Gaetan Nadon]

Namely XORG_WITH_FOP for the fop backend (pdf) and
XORG_ENABLE_DEVEL_DOCS for the generation of all docs

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am  |    8 ++++----
 configure.ac |   22 ++++------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 41abd05..36a353c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,12 +173,12 @@ endif LINT
 # Developer documentation - not installed on system
 EXTRA_DIST += doc/xfs-design.xml doc/xfs-design.css doc/xfs-design.xsl
 
-if MAKE_DEVEL_DOCS
+if ENABLE_DEVEL_DOCS
 if HAVE_XMLTO
 noinst_DATA = doc/xfs-design/index.html doc/xfs-design.txt
-if HAVE_XMLFOP
+if HAVE_FOP
 noinst_DATA += doc/xfs-design.pdf
-endif HAVE_XMLFOP
+endif HAVE_FOP
 CLEANFILES += $(noinst_DATA)
 
 doc/xfs-design/index.html: $(srcdir)/doc/xfs-design.xml $(srcdir)/doc/xfs-design.xsl doc/xfs-design/xfs-design.css
@@ -199,4 +199,4 @@ doc/xfs-design.txt: $(srcdir)/doc/xfs-design.xml $(srcdir)/doc/xfs-design.xsl
 	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/xfs-design.xsl -o doc txt $(srcdir)/doc/xfs-design.xml
 
 endif HAVE_XMLTO
-endif MAKE_DEVEL_DOCS
+endif ENABLE_DEVEL_DOCS
diff --git a/configure.ac b/configure.ac
index 85bcac6..474f577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,11 @@ AM_CONFIG_HEADER(xfs-config.h)
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.5)
+	  [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.6)
+XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_XMLTO
+XORG_WITH_FOP
 
 # Set common system defines for POSIX extensions, such as _GNU_SOURCE
 # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
@@ -95,22 +97,6 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [
                                 [ FONTPATH="${DEFAULT_FONT_PATH}" ])
 AC_SUBST([FONTPATH])
 
-AC_PATH_PROG([XMLFOP], [fop])
-if test "x$XMLFOP" = "x"; then
-   AC_MSG_WARN([fop not found - pdf documentation targets will be skipped])
-   have_xmlfop=no
-else
-   have_xmlfop=yes
-fi
-AM_CONDITIONAL([HAVE_XMLFOP], [test "$have_xmlfop" = yes])
-
-# Option to enable support for building developer internals docs
-AC_ARG_ENABLE(devel-docs,
-	AS_HELP_STRING([--enable-devel-docs],
-	    [Build internals documentation for developers (default: enabled)]),
-	    [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
-AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
-
 # Option to enable support for starting from inetd
 AC_ARG_ENABLE(inetd,
 	AS_HELP_STRING([--enable-inetd],
-- 
1.6.0.4