From 8f9c2bd96093a2c4c4b19a867492ef7709b45d5f Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Sat, 3 Oct 2009 21:28:59 -0400
Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Change-Id: I80474c62b0f8c263992b3b4f22014dc53cfc619d
Signed-off-by: James Cloos <cloos@jhcloos.com>
---
 Makefile.am  |  2 +-
 configure.ac | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ca2956c..0de2583 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
diff --git a/configure.ac b/configure.ac
index d1fb5a5..1513153 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,14 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# 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)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XEYES, x11 xt xext xmu)
@@ -52,8 +52,4 @@ if test x$use_xrender != xno ; then
 	AC_DEFINE([XRENDER],1,[Define to use X Render Extension])
 fi
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3