From 3a8a64fb122befa5253962252b96718774540ed1 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon, 12 Oct 2009 21:38:52 -0700
Subject: [PATCH] Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Change-Id: I58ac82a1ccabe552dd58353dfc143f202a9a6464
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 Makefile.am  |  4 ++--
 configure.ac | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 99e345f..a1224ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xwud
 
-xwud_CFLAGS = $(XWUD_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XWUD_CFLAGS)
 xwud_LDADD = $(XWUD_LIBS)
 
 xwud_SOURCES =	\
@@ -60,7 +60,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 4ed0947..7a138dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,25 +26,21 @@ AC_INIT(xwud,[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 1.3 or later: 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)
 
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XWUD, x11)
-XWUD_CFLAGS="$CWARNFLAGS $XWUD_CFLAGS"
 AC_SUBST(XWUD_CFLAGS)
 AC_SUBST(XWUD_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
-- 
2.7.4