From 66144575be381b1a1eff4325d925c74be898b59c Mon Sep 17 00:00:00 2001
From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon, 1 Dec 2008 22:18:45 +0100
Subject: [PATCH] use xorg-macros-1.2.1

Use XORG_CHANGELOG for rule to generate ChangeLog from git log
Use XORG_CWARNFLAGS for compiler warning flags, leave CFLAGS to user
---
 Makefile.am  |    2 +-
 configure.ac |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bf06f07..5d79b62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 918e129..de0726e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,17 +36,19 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type])
 # Checks for header files.
 AC_HEADER_STDC
 
+# Require xorg-macros at least 1.2.1
+XORG_MACROS_VERSION([1.2.1])
+m4_ifndef([XORG_MACROS_VERSION],
+	[AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
+
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
 XORG_LINT_LIBRARY([ICE])
 LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}"
 
-if test "x$GCC" = "xyes"; then
-	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing"
-	CFLAGS="$GCC_WARNINGS $CFLAGS"
-fi
+XORG_CHANGELOG
+
+XORG_CWARNFLAGS
 
 XORG_RELEASE_VERSION
 
-- 
1.6.0.3