From 829d1e085d4e02f4352c9dbd4aa9968dc7a67af4 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Mon, 10 Nov 2003 13:01:06 +0000 Subject: Ugly autotools foo. nodist_HEADERS requires automake 1.6 or later. add this requirement to AUTOMAKE_OPTIONS and port the corresponding autogen support from libao. svn path=/trunk/ogg/; revision=5549 --- autogen.sh | 60 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 11 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index ccdc164..a2d3731 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,15 +20,53 @@ echo "checking for autoconf... " DIE=1 } -echo "checking for automake... " -(automake --version) < /dev/null > /dev/null 2>&1 || { +VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" + +# do we need automake? +if test -r Makefile.am; then + AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP` + if test -z $AM_NEEDED; then + echo -n "checking for automake... " + AUTOMAKE=automake + ACLOCAL=aclocal + if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then + echo "no" + AUTOMAKE= + else + echo "yes" + fi + else + echo -n "checking for automake $AM_NEEDED or later... " + for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do + ($am --version < /dev/null > /dev/null 2>&1) || continue + ver=`$am --version < /dev/null | head -1 | $VERSIONGREP` + if test $ver = $AM_NEEDED; then + AUTOMAKE=$am + echo $AUTOMAKE + break + fi + done + test -z $AUTOMAKE && echo "no" + echo -n "checking for aclocal $AM_NEEDED or later... " + for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do + ($ac --version < /dev/null > /dev/null 2>&1) || continue + ver=`$ac --version < /dev/null | head -1 | $VERSIONGREP` + if test $ver = $AM_NEEDED; then + ACLOCAL=$ac + echo $ACLOCAL + break + fi + done + test -z $ACLOCAL && echo "no" + fi + test -z $AUTOMAKE || test -z $ACLOCAL && { echo echo "You must have automake installed to compile $package." - echo "Download the appropriate package for your system," - echo "or get the source from one of the GNU ftp sites" - echo "listed in http://www.gnu.org/order/ftp.html" - DIE=1 -} + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + exit 1 + } +fi echo -n "checking for libtool... " for LIBTOOLIZE in libtoolize glibtoolize nope; do @@ -60,14 +98,14 @@ fi echo "Generating configuration files for $package, please wait...." -echo " aclocal $ACLOCAL_FLAGS" -aclocal $ACLOCAL_FLAGS +echo " $ACLOCAL $ACLOCAL_FLAGS" +$ACLOCAL $ACLOCAL_FLAGS #echo " autoheader" #autoheader echo " $LIBTOOLIZE --automake" $LIBTOOLIZE --automake -echo " automake --add-missing $AUTOMAKE_FLAGS" -automake --add-missing $AUTOMAKE_FLAGS +echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS echo " autoconf" autoconf -- cgit v1.2.1