diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-16 12:29:26 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-16 12:34:37 +1000 |
commit | 650c52db8b30cebca3386ac350154a6b3a0abbe1 (patch) | |
tree | 5d1fce0cb18576f8eb7777df3ff694c0fd833bc4 | |
parent | 22fdd63f4521c89ae43bbfc6741e872b4a74d18f (diff) |
Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS.
-rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 2e198c7..1719113 100644 --- a/configure.ac +++ b/configure.ac @@ -6,16 +6,16 @@ AC_INIT(xinput,[1.4.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, 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) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5]) @@ -32,10 +32,6 @@ AC_SUBST(HAVE_XI2) AC_SUBST(VERSION) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile man/Makefile]) |