From 556eea2a0d2b0d5d599926524b2c0c2907006fd3 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sun, 9 Jan 2011 09:52:11 -0500
Subject: [PATCH] Create a bzip2 archive. Portability fix for autogen.sh. Fixed
 the 'changelog' Makefile target.

---
 Makefile.am  |  3 ++-
 autogen.sh   |  8 +++++---
 configure.ac | 14 ++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f461203..6895253 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
 EXTRA_DIST = KnownBugs NEWS ChangeLog
 SUBDIRS = src doc contrib
+ACLOCAL_AMFLAGS = -I m4
 
 changelog:
-	git-log --no-color > ChangeLog || exit 1
+	git log --no-color > ChangeLog || exit 1
 
 version: changelog
 	$(MAKE) $(AM_MAKEFLAGS) distcheck
diff --git a/autogen.sh b/autogen.sh
index 9152023..6203dee 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,10 +13,12 @@
 # Conflicts: autoconf 2.13
 set -e
 
+cd "$(dirname "$0")"
+
 # Refresh GNU autotools toolchain.
 echo Cleaning autotools files...
-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
+find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
+find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
 	-o -name depcomp -o -name ltmain.sh -o -name configure \
 	-o -name config.sub -o -name config.guess \
 	-o -name Makefile.in \) -print0 | xargs -0 rm -f
@@ -34,7 +36,7 @@ test -d debian && {
 	# refresh list of executable scripts, to avoid possible breakage if
 	# upstream tarball does not include the file or if it is mispackaged
 	# for whatever reason.
-	[ "$1" == "updateexec" ] && {
+	[ "$1" = "updateexec" ] && {
 		echo Generating list of executable files...
 		rm -f debian/executable.files
 		find -type f -perm +111 ! -name '.*' -fprint debian/executable.files
diff --git a/configure.ac b/configure.ac
index 2a34b55..6447090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,10 @@
-dnl $Id: configure.ac,v 2.2 2005-07-30 12:57:04 bjk Exp $
-dnl
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT(userinfo, 2.2, [Ben Kibbey <bjk@luxsci.net>])
+AC_PREREQ(2.60)
+AC_INIT(userinfo, 2.2, [Ben Kibbey bjk@luxsci.net])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(build)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign])
-AC_PROG_MAKE_SET
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_LIBTOOL_DLOPEN
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -17,7 +15,11 @@ LIBTOOL="$LIBTOOL --silent"
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_AWK
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
-- 
2.11.4.GIT