From 31fe929d3ea43cd8fbe2853157682677704883ad Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Tue, 27 Oct 2009 15:07:25 -0400
Subject: Deploy the new XORG_DEFAULT_OPTIONS #24242

This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
---
 configure.ac | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5ac3af1..a786656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,11 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -40,7 +42,6 @@ AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
-XORG_CWARNFLAGS
 
 PKG_CHECK_MODULES(XAU, xproto)
 XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
@@ -76,9 +77,6 @@ XORG_WITH_LINT
 XORG_LINT_LIBRARY([Xau])
 LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            xau.pc])
-- 
cgit v1.2.3