diff --git a/ANNOUNCE b/ANNOUNCE index 0ed70b83f..082e829cd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -86,6 +86,8 @@ version 1.4.4rc03 [September 14, 2010] version 1.4.4rc04 [September 15, 2010] Fixed indentation and removed debugging message from CMakeLists.txt + Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER, + $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c096172f1..d2108f3c8 100644 --- a/CHANGES +++ b/CHANGES @@ -2670,6 +2670,8 @@ version 1.4.4rc03 [September 14, 2010] version 1.4.4rc04 [September 15, 2010] Fixed indentation and removed debugging message from CMakeLists.txt + Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER, + $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/autogen.sh b/autogen.sh index 77b63087c..5be104eb1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,22 +4,31 @@ # # WARNING: if you run this you will change the versions # of the tools which are used and, maybe, required! - touch Makefile.am configure.ac + +# You can define your own replacements in your environment. +# $AUTOCONF, $AUTOMAKE, $AUTOHEADER, $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE + +touch Makefile.am configure.ac { - echo "running libtoolize" >&2 - libtoolize --force --copy --automake + LT=${LIBTOOLIZE-libtoolize} + echo "running $LT" >&2 + $LT --force --copy --automake } && { - echo "running aclocal" >&2 - aclocal + AL=${ACLOCAL-aclocal} + echo "running $AL" >&2 + $AL } && { - echo "running autoheader [ignore the warnings]" >&2 - autoheader + AH=${AUTOHEADER-autoheader} + echo "running $AH [ignore the warnings]" >&2 + $AH } && { - echo "running automake" >&2 - automake --force-missing --foreign -a -c + AM=${AUTOMAKE-automake} + echo "running $AM" >&2 + $AM --force-missing --foreign -a -c } && { - echo "running autoconf" >&2 - autoconf + AC=${AUTOCONF-autoconf} + echo "running $AC" >&2 + $AC } && - echo "autogen complete" >&2 || - echo "ERROR: autogen.sh failed, autogen is incomplete" >&2 + echo "autogen complete" >&2 || + echo "ERROR: autogen.sh failed, autogen is incomplete" >&2