Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.35
diff -u -r1.35 ChangeLog
--- ChangeLog	1 Mar 2006 02:23:43 -0000	1.35
+++ ChangeLog	1 Mar 2006 18:35:55 -0000
@@ -0,0 +1,5 @@
+2006-03-01  Danilo Piazzalunga  <danilopiazza@gmail.com>
+
+	* autogen.sh: Allow overriding aclocal, automake, autoconf and
+	libtoolize using environment variables. Taken from cairo's autogen.sh.
+
Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairomm/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- autogen.sh	21 Feb 2006 05:20:05 -0000	1.2
+++ autogen.sh	1 Mar 2006 18:35:55 -0000
@@ -1,4 +1,5 @@
 #! /bin/sh
+set -e
 
 # $Id: autogen.sh,v 1.2 2006-02-21 05:20:05 jjongsma Exp $
 #
@@ -30,18 +31,21 @@
     exit 1
 fi
 
-rm -f config.cache acconfig.h
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOMAKE=${AUTOMAKE:-automake}
 
-echo "- aclocal."		&& \
-aclocal 			&& \
-echo "- libtoolize."		&& \
-libtoolize --force 		&& \
-echo "- autoconf."		&& \
-autoconf			&& \
-echo "- automake."		&& \
-automake --add-missing --gnu	&& \
-echo				&& \
-./configure "$@"		&& exit 0
+ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
 
-exit 1
+rm -f config.cache acconfig.h
 
+do_cmd() {
+    echo "- $@"
+    $@
+}
+
+do_cmd $ACLOCAL
+do_cmd $LIBTOOLIZE --force
+do_cmd $AUTOCONF
+do_cmd $AUTOMAKE --add-missing --gnu
+do_cmd ./configure "$@"