[cairo-commit] cairo ChangeLog,1.117,1.118 autogen.sh,1.2,1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv23774

Modified Files:
	ChangeLog autogen.sh 
Log Message:

        * autogen.sh (AUTOCONF): Allow names of all autofoo programs to be
        overridden via environment variables.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** ChangeLog	5 Dec 2003 16:53:07 -0000	1.117
--- ChangeLog	5 Dec 2003 18:30:39 -0000	1.118
***************
*** 1,4 ****
--- 1,7 ----
  2003-12-05  Carl Worth  <cworth at 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.

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** autogen.sh	19 Aug 2003 01:52:46 -0000	1.2
--- autogen.sh	5 Dec 2003 18:30:39 -0000	1.3
***************
*** 4,7 ****
--- 4,15 ----
  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
  
***************
*** 33,45 ****
  }
  
! do_cmd libtoolize --force --copy
  
! do_cmd aclocal ${ACLOCAL_FLAGS}
  
! do_cmd autoheader
  
! do_cmd automake --add-missing
  
! do_cmd autoconf
  
  do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
--- 41,53 ----
  }
  
! do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
  
! do_cmd $ACLOCAL $ACLOCAL_FLAGS
  
! do_cmd $AUTOHEADER
  
! do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
  
! do_cmd $AUTOCONF
  
  do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1