diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-17 14:51:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-17 16:29:03 +1000 |
| commit | f9fa8f9a7dc333b45bfac0b0c6f97b8b1a72d260 (patch) | |
| tree | de188f04de5184dab9c6224a0bfcb95363c2d8c7 /configure.ac | |
| parent | a02566ca7fd37d279b957037e1251a3b3419866d (diff) | |
| parent | 47901cd142e832eb930166cbfa769e4fbca969c5 (diff) | |
Merge branch 'master' into chase-multitouch
Conflicts:
specs/XI2proto.txt
Fixed up (added) asciidoc for touch proto.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 894d2cd..c755917 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,14 @@ AC_INIT([InputProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?pr AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [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_ASCIIDOC(8.4.5) AC_OUTPUT([Makefile + specs/Makefile inputproto.pc]) |