diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
| commit | e445df175688f07d599649591c990d432375c67e (patch) | |
| tree | fc2295b9683852cab5394a4f187ca0001c987e4a /X11/configure.ac | |
| parent | cbeb9ffa0c58e5e9b012ea3eb17dbf192659627f (diff) | |
| parent | cd50a4bbac9375d3cd460bbdf88395f802609daf (diff) | |
| download | vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.gz vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.bz2 vcxsrv-e445df175688f07d599649591c990d432375c67e.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'X11/configure.ac')
| -rw-r--r-- | X11/configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/X11/configure.ac b/X11/configure.ac index 5bcf3eff0..eff39c36d 100644 --- a/X11/configure.ac +++ b/X11/configure.ac @@ -1,10 +1,14 @@ AC_PREREQ([2.57]) -AC_INIT([Xproto], [7.0.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) +# 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) + AC_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -197,6 +201,7 @@ if test "x$WIDEPROTO" = xno; then fi XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile Xpoll.h |