diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-13 19:54:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-13 19:54:55 +0200 |
| commit | f4babb3a422e27cd33fba36f7a21eb67b7dee25d (patch) | |
| tree | 92729aa42576ba2ef746c0168231ce806ddf114d /X11 | |
| parent | ee6b5ca3b101697d067675efa68f0e603cd61ffa (diff) | |
| download | vcxsrv-f4babb3a422e27cd33fba36f7a21eb67b7dee25d.tar.gz vcxsrv-f4babb3a422e27cd33fba36f7a21eb67b7dee25d.tar.bz2 vcxsrv-f4babb3a422e27cd33fba36f7a21eb67b7dee25d.zip | |
libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git update 13 Jun 2011
Diffstat (limited to 'X11')
| -rw-r--r-- | X11/extensions/configure.ac | 2 | ||||
| -rw-r--r-- | X11/extensions/docbook.am | 6 | ||||
| -rw-r--r-- | X11/xtrans/configure.ac | 2 | ||||
| -rw-r--r-- | X11/xtrans/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | X11/xtrans/docbook.am | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac index a12f7f452..6c6824885 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) diff --git a/X11/xtrans/configure.ac b/X11/xtrans/configure.ac index 66a7a975e..3b38d29de 100644 --- a/X11/xtrans/configure.ac +++ b/X11/xtrans/configure.ac @@ -38,7 +38,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) # Because xtrans is included into other modules rather than being linked # with, these defines have to be added to the cflags line diff --git a/X11/xtrans/doc/Makefile.am b/X11/xtrans/doc/Makefile.am index 71b40e4e5..014c956ae 100644 --- a/X11/xtrans/doc/Makefile.am +++ b/X11/xtrans/doc/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_DOCS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xtrans.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/X11/xtrans/docbook.am b/X11/xtrans/docbook.am index 3cf21e879..2ffb7e60a 100644 --- a/X11/xtrans/docbook.am +++ b/X11/xtrans/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) |