diff options
Diffstat (limited to 'libXdmcp')
| -rw-r--r-- | libXdmcp/configure.ac | 2 | ||||
| -rw-r--r-- | libXdmcp/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | libXdmcp/docbook.am | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac index b3bb9fa17..44e8a5750 100644 --- a/libXdmcp/configure.ac +++ b/libXdmcp/configure.ac @@ -44,7 +44,7 @@ XORG_ENABLE_DOCS XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
# Checks for programs.
AC_PROG_LN_S
diff --git a/libXdmcp/doc/Makefile.am b/libXdmcp/doc/Makefile.am index fe11b9e65..b722ddd55 100644 --- a/libXdmcp/doc/Makefile.am +++ b/libXdmcp/doc/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = xdmcp.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/libXdmcp/docbook.am b/libXdmcp/docbook.am index 3cf21e879..2ffb7e60a 100644 --- a/libXdmcp/docbook.am +++ b/libXdmcp/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -71,7 +72,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC # DocBook/XML generated document cross-reference database -sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) |