From 266da0b9c176cf0dc615005bb0ad4aa585892bd8 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 16 Oct 2009 17:17:41 -0700
Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

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

diff --git a/Makefile.am b/Makefile.am
index 5b494ad..883dad3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ LIBPATH = $(libdir)/X11/x11perfcomp
 x11perfcompdir = $(LIBPATH)
 dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark
 
-AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
 x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm
 
 x11perf_SOURCES =	\
@@ -58,7 +58,7 @@ appman_PRE = \
         Xmark.man
 
 x11perfcomp: x11pcomp.cpp
-	$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
+	$(AM_V_GEN)$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
 		$(SED) s/XCOMM/\#/ > $@
 
 
@@ -73,8 +73,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 EXTRA_DIST += $(appman_PRE)
 CLEANFILES += $(appman_DATA)
 
-SED = sed
-
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
@@ -95,7 +93,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 24e7896..d877e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,16 +25,17 @@ AC_INIT(x11perf,[1.5], [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
 
 AC_PATH_PROG(SED,sed)
 if [[ -z $SED ]] ; then
@@ -45,7 +46,6 @@ AC_TYPE_SIGNAL
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(X11PERF, x11 xmuu)
-X11PERF_CFLAGS="$CWARNFLAGS $X11PERF_CFLAGS"
 AC_SUBST(X11PERF_CFLAGS)
 AC_SUBST(X11PERF_LIBS)
 
@@ -83,8 +83,4 @@ yes)
 	;;
 esac
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3