From 1f8f6431bf84228b3c5877be8e20eeb43dcab64d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 Sep 2009 11:25:21 +1000 Subject: Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS. Signed-off-by: Peter Hutterer --- configure.ac | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 9135ad2..5b03f86 100644 --- a/configure.ac +++ b/configure.ac @@ -35,16 +35,16 @@ AM_MAINTAINER_MODE DRIVER_NAME=void AC_SUBST([DRIVER_NAME]) -# 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]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AH_TOP([#include "xorg-server.h"]) @@ -65,8 +65,5 @@ AC_SUBST([CFLAGS]) # Checks for header files. AC_HEADER_STDC -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) -- cgit v1.2.3