From 7a9b269ed83c106265896373120603b9c06997f3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 5 Oct 2009 10:38:34 +1000 Subject: Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer --- configure.ac | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b090f16..aed19a0 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,15 @@ AC_INIT(libXtst, 1.0.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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Check for xmlto for man page conversion # (only needed by people building tarballs) @@ -54,10 +54,6 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xtst]) LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}" -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile man/Makefile src/Makefile -- cgit v1.2.3