[cairo-commit] gtkcairo autogen.sh,1.1,1.2

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/gtkcairo
In directory gabe:/tmp/cvs-serv22581

Modified Files:
	autogen.sh 
Log Message:
2005-04-08  Dave Beckett  <Dave.Beckett at bristol.ac.uk>

	* autogen.sh: Allow libtoolize, aclocal, autoheader, automake and
	autoconf to be overridden.  Keep the defaults the same.


Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/gtkcairo/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autogen.sh	18 Nov 2003 22:15:03 -0000	1.1
+++ autogen.sh	8 Apr 2005 10:22:52 -0000	1.2
@@ -5,8 +5,17 @@
 
 ARGV0=$0
 
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+LIBTOOLIZE_FLAGS="--copy --force"
+ACLOCAL=${ACLOCAL-aclocal}
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE=${AUTOMAKE-automake}
+AUTOMAKE_FLAGS="--add-missing"
+AUTOCONF=${AUTOCONF-autoconf}
+
+
 if test -z "$ACLOCAL_FLAGS"; then
-    acdir=`aclocal --print-ac-dir`
+    acdir=`$ACLOCAL --print-ac-dir`
     if [ ! -f $acdir/pkg.m4 ]; then
 	echo "$ARGV0: Error: Could not find pkg-config macros."
 	echo "        (Looked in $acdir/pkg.m4)"
@@ -32,14 +41,14 @@
     $@
 }
 
-do_cmd libtoolize --force --copy
+do_cmd $LIBTOOLIZE --force --copy
 
-do_cmd aclocal ${ACLOCAL_FLAGS}
+do_cmd $ACLOCAL ${ACLOCAL_FLAGS}
 
-do_cmd autoheader
+do_cmd $AUTOHEADER
 
-do_cmd automake --add-missing
+do_cmd $AUTOMAKE --add-missing
 
-do_cmd autoconf
+do_cmd $AUTOCONF
 
 do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1