From 0bd51760a0d92181faedbd52e7d7249c8179f95d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Oct 2009 15:34:22 +1000 Subject: Actually use XORG_DEFAULT_OPTIONS For some reason, this part didn't make it into 8eab9123467b047f2b4ddec7df48a679c9254ca1. Signed-off-by: Peter Hutterer --- configure.ac | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 57821ef..f34bf25 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# 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(src/config.h) @@ -12,16 +12,13 @@ AM_CONFIG_HEADER(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2]) XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS" XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile -- cgit v1.2.3