From 6a86a2a95a40350ce19a6f5e802452cc28f1b968 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue, 27 Jan 2009 19:11:08 -0200
Subject: Janitor: Correct make distcheck and configure.ac simplification

---
 .gitignore   |  3 +++
 Makefile.am  |  2 +-
 configure.ac | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0c84e7..51c8728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ encodings.dir
 install-sh
 missing
 *~
+encodings-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index f9e798b..29a875d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ MAINTAINERCLEANFILES=ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	git-log > ChangeLog
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 1ecebd0..0fc8bbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,9 @@ AC_PREREQ([2.57])
 AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+# Require xorg-macros: 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)
 
 # mkfontscale
 
@@ -14,13 +16,13 @@ fi
 # Choose whether or not to compress encodings - default is to compress all
 
 AC_ARG_ENABLE(gzip-small-encodings,
-	AS_HELP_STRING([--disable-gzip-small-encodings],
+	AC_HELP_STRING([--disable-gzip-small-encodings],
 			[Disable compression of small encoding files]),
 	[GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"]) 
 AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes])
 
 AC_ARG_ENABLE(gzip-large-encodings,
-	AS_HELP_STRING([--disable-gzip-large-encodings],
+	AC_HELP_STRING([--disable-gzip-large-encodings],
 			[Disable compression of large encoding files]),
 	[GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"]) 
 AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes])
@@ -34,13 +36,13 @@ if test x$GZIP_SMALL = xyes -o x$GZIP_LARGE = xyes ; then
     fi
 fi
 
-DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-AC_ARG_WITH(encodingsdir,
-	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
-	[ENCODINGSDIR="$withval"],
-	[ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
+encodingsdir=${libdir}/X11/fonts/encodings
+AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
+	[Path to install font encodings]), [encodingsdir="$withval"])
+ENCODINGSDIR="$encodingsdir"
 AC_SUBST(ENCODINGSDIR)
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile large/Makefile])
-- 
cgit v1.2.3