diff options
author | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
commit | 0fd309bfed8f9f61a8ea8bbbe7628d0af471c070 (patch) | |
tree | 97a335ffb903e9cf159322f3906f9cb71d660d9c /X11/extensions/configure.ac | |
parent | dab40e0df33e80dab53b4ca20760c1fb4388649b (diff) | |
parent | 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d (diff) | |
download | vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.gz vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.bz2 vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.zip |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/configure.ac')
-rw-r--r-- | X11/extensions/configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac index a8ce7c171..4e1c34bdd 100644 --- a/X11/extensions/configure.ac +++ b/X11/extensions/configure.ac @@ -3,15 +3,16 @@ AC_INIT([XExtProto], [7.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?produc AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.7)
AC_OUTPUT([Makefile
specs/Makefile
|