From 982d3b53606238b4602bbdbc4f0f1f9c1bd0563b Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu, 1 Oct 2009 14:10:15 -0700
Subject: Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Jeremy
 Huddleston <jeremyhu@apple.com>>

---
 configure.ac | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 13fd703..8f1012a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,17 +25,17 @@ AC_INIT(xlogo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 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)
+
+XORG_DEFAULT_OPTIONS
 
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_CWARNFLAGS
-
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XLOGO, xaw7)
 
@@ -75,8 +75,4 @@ AC_ARG_WITH(appdefaultdir,
 	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3