From 3a59c294d30f5c68dc1411a1a7a274948e08d528 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat, 3 Oct 2009 14:51:44 -0700
Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 Makefile.am  |  3 ++-
 configure.ac | 13 ++++---------
 cpprules.in  |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ae7ad77..1a75f75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ XINITDIR = $(libdir)/X11/xinit
 bin_PROGRAMS = xinit
 bin_SCRIPTS = startx
 
-AM_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
+AM_CFLAGS = $(CWARNFLAGS) $(XINIT_CFLAGS)
+AM_CPPFLAGS = -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
 xinit_LDADD = $(XINIT_LIBS)
 
 xinit_SOURCES =	\
diff --git a/configure.ac b/configure.ac
index 7f354f9..29b6961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,9 @@ AC_INIT(xinit,[1.1.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)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -45,7 +45,7 @@ AC_CHECK_FUNCS([killpg])
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Build options
 DEFAULT_XRDB=xrdb
@@ -143,7 +143,6 @@ case $host_os in
         ;;
 esac
 
-XINIT_CFLAGS="$CWARNFLAGS $XINIT_CFLAGS"
 AC_SUBST(XINIT_CFLAGS)
 AC_SUBST(XINIT_LIBS)
 
@@ -195,9 +194,5 @@ AC_SUBST(XINIT)
 # Cheat, lie, and assume all the world is Xorg for now
 AC_DEFINE(XORG, 1, [Define if you have Xorg X server])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
 AC_OUTPUT([privileged_startx/Makefile])
diff --git a/cpprules.in b/cpprules.in
index f32eafc..c04855b 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -31,7 +31,7 @@ MANDEFS =  \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
 
 .cpp:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-- 
cgit v1.2.3