From dc9e2c696121f677065919bc5b011eb650791831 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu, 8 Oct 2009 08:44:24 -0700
Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 configure.ac    | 15 ++++++---------
 man/Makefile.am |  2 +-
 src/Makefile.am |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 754ef2c..acd52a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,15 +36,17 @@ AC_INIT(libXfixes, 4.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
 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)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
 		  
 # Check fixesext configuration, strip extra digits from package version to
 # find the required protocol version
@@ -52,14 +54,9 @@ XORG_CWARNFLAGS
 FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 AC_SUBST(FIXESEXT_VERSION)
 PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto x11)
-FIXESEXT_CFLAGS="$CWARNFLAGS $FIXESEXT_CFLAGS"
 AC_SUBST(FIXESEXT_CFLAGS)
 AC_SUBST(FIXESEXT_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
 	   src/Makefile
 	   man/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 6668aff..3d95e5f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -47,4 +47,4 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ba9522..544230f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ libXfixes_la_SOURCES = 	\
 	Xfixesint.h
 
 libXfixes_la_LIBADD = @FIXESEXT_LIBS@
-AM_CFLAGS = @FIXESEXT_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
 
-- 
cgit v1.2.3