From ad4030932490f848c8ac21ba5a7a8d734994ed15 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Mon, 26 Oct 2009 12:54:21 -0400
Subject: Several driver modules do not have a ChangeLog target in Makefile.am
 #23814

The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
---
 Makefile.am  | 7 ++++++-
 configure.ac | 9 ++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 79bdaabe..9261766b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,4 +22,9 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = uxa src man
 
-EXTRA_DIST = README AUTHORS NEWS
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 2348a7a7..fda064a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: 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)
+XORG_DEFAULT_OPTIONS
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -153,9 +159,6 @@ DRIVER_NAME=intel
 AC_SUBST([DRIVER_NAME])
 AC_SUBST([moduledir])
 
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
 XORG_CHECK_LINUXDOC
 
 AC_OUTPUT([
-- 
cgit v1.2.3