diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-02 09:00:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-02 09:00:24 +0000 |
| commit | 240baf59a219841c5f8942c82f7ed61da9d2323b (patch) | |
| tree | 76937e127002c1ba58c5a379651f20a17e866627 /xorg-server/configure.ac | |
| parent | 6c5a4ae0c8e57225ce31fb0a39c87ec9a5eed2b5 (diff) | |
| parent | d2758df0a0091496717fe7a65c3e7563e7c82785 (diff) | |
| download | vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.tar.gz vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.tar.bz2 vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 979f4db86..50313b616 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -32,12 +32,13 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.6)
+ [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
XORG_DEFAULT_OPTIONS
XORG_WITH_DOXYGEN(1.6.1)
+XORG_CHECK_SGML_DOCTOOLS(1.5)
m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
XORG_FONT_MACROS_VERSION(1.1)
@@ -2182,6 +2183,7 @@ dbe/Makefile dix/Makefile
doc/Makefile
doc/xml/Makefile
+doc/xml/dtrace/Makefile
doc/xml/xserver.ent
fb/Makefile
record/Makefile
|