From 97666464c0a38d5904869af1c742c87c3be15067 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Fri, 5 Dec 2003 10:30:39 +0000
Subject: [PATCH] Allow names of all autofoo programs to be overridden via
 environment variables.

---
 ChangeLog  |  3 +++
 autogen.sh | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dcad4163..83aec716e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-12-05  Carl Worth  <cworth@east.isi.edu>
 
+	* autogen.sh (AUTOCONF): Allow names of all autofoo programs to be
+	overridden via environment variables.
+
 	* configure.in: Bump version to 0.1.15 for new
 	CAIRO_HAS_XLIB_SURFACE macro.
 
diff --git a/autogen.sh b/autogen.sh
index 61b269ab8..fe847d9eb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,14 @@
 
 set -e
 
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+LIBTOOLIZE_FLAGS="--copy --force"
+ACLOCAL=${ACLOCAL-aclocal}
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE=${AUTOMAKE-automake}
+AUTOMAKE_FLAGS="--add-missing"
+AUTOCONF=${AUTOCONF-autoconf}
+
 ARGV0=$0
 
 if test -z "$ACLOCAL_FLAGS"; then
@@ -32,14 +40,14 @@ do_cmd() {
     $@
 }
 
-do_cmd libtoolize --force --copy
+do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
 
-do_cmd aclocal ${ACLOCAL_FLAGS}
+do_cmd $ACLOCAL $ACLOCAL_FLAGS
 
-do_cmd autoheader
+do_cmd $AUTOHEADER
 
-do_cmd automake --add-missing
+do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
 
-do_cmd autoconf
+do_cmd $AUTOCONF
 
 do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1