diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-02 07:38:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-02 07:38:20 +0000 |
| commit | 0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69 (patch) | |
| tree | 452e5f8d321b2333425953c5e6faacaff90f12cd /libX11 | |
| parent | 0b12d0ee7eee12858ea04ab852836b1137338593 (diff) | |
| parent | 135e2e73bbe7155901a651c38b772e7b4547f39c (diff) | |
| download | vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.tar.gz vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.tar.bz2 vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index f174f31e1..80e38a931 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60)
AC_INIT([libX11],
- 1.3.99.902,
+ [1.3.99.903],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -21,14 +21,14 @@ AC_CONFIG_HEADER([include/X11/XlibConf.h]) # to avoid autoconf errors.
AC_USE_SYSTEM_EXTENSIONS
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.11 for disabling fop by default
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.11 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.11)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
+XORG_WITH_FOP([no])
XORG_CHECK_SGML_DOCTOOLS(1.5)
XORG_PROG_RAWCPP
|