diff options
author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /X11/extensions/configure.ac | |
parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/configure.ac')
-rw-r--r-- | X11/extensions/configure.ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac index 4931d3b72..599651b35 100644 --- a/X11/extensions/configure.ac +++ b/X11/extensions/configure.ac @@ -1,12 +1,18 @@ -AC_PREREQ([2.57]) -AC_INIT([XExtProto], [7.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_PREREQ([2.60]) +AC_INIT([XExtProto], [7.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros minimum of 1.10 for DocBook XML documentation +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) +XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) AC_OUTPUT([Makefile + specs/Makefile xextproto.pc]) |