aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-13 19:59:46 +0200
committermarha <marha@users.sourceforge.net>2011-06-13 19:59:46 +0200
commit0d495843cebea4ae94a3138db2bf51da80a16391 (patch)
tree6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /X11/extensions
parent01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff)
parentf4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff)
downloadvcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz
vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2
vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'X11/extensions')
-rw-r--r--X11/extensions/configure.ac2
-rw-r--r--X11/extensions/docbook.am6
2 files changed, 5 insertions, 3 deletions
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac
index 4e1c34bdd..ccb4f0145 100644
--- a/X11/extensions/configure.ac
+++ b/X11/extensions/configure.ac
@@ -12,7 +12,7 @@ XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff --git a/X11/extensions/docbook.am b/X11/extensions/docbook.am
index 3cf21e879..2ffb7e60a 100644
--- a/X11/extensions/docbook.am
+++ b/X11/extensions/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)