[cairo-commit] cairomm ChangeLog,1.36,1.37 autogen.sh,1.2,1.3

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm
In directory kemper:/tmp/cvs-serv23236

Modified Files:
	ChangeLog autogen.sh 
Log Message:
2006-03-12  Danilo Piazzalunga  <danilopiazza at gmail.com>

	* autogen.sh: Allow overriding aclocal, automake, autoconf and libtoolize
	using environment variables. Taken from cairo's autogen.sh.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	6 Mar 2006 17:55:51 -0000	1.36
+++ ChangeLog	13 Mar 2006 01:43:04 -0000	1.37
@@ -1,3 +1,8 @@
+2006-03-12  Danilo Piazzalunga  <danilopiazza at gmail.com>
+
+	* autogen.sh: Allow overriding aclocal, automake, autoconf and libtoolize
+	using environment variables. Taken from cairo's autogen.sh.
+
 2006-03-06  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
 
 	* cairomm/*.cc, *.h: add vim modelines to set proper indentation for

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairomm/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- autogen.sh	21 Feb 2006 05:20:05 -0000	1.2
+++ autogen.sh	13 Mar 2006 01:43:04 -0000	1.3
@@ -1,4 +1,5 @@
 #! /bin/sh
+set -e
 
 # $Id$
 #
@@ -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 "$@"