Commit 62cdea16 authored by Ralph Giles's avatar Ralph Giles

Update autogen.sh to handle automake 1.10.

svn path=/trunk/vorbis/; revision=13069
parent 3eeb6c97
...@@ -20,9 +20,10 @@ echo "checking for autoconf... " ...@@ -20,9 +20,10 @@ echo "checking for autoconf... "
DIE=1 DIE=1
} }
VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
VERSIONMKINT="sed -e s/[^0-9]//" VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/"
VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//"
# do we need automake? # do we need automake?
if test -r Makefile.am; then if test -r Makefile.am; then
AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am`
...@@ -42,12 +43,15 @@ if test -r Makefile.am; then ...@@ -42,12 +43,15 @@ if test -r Makefile.am; then
fi fi
else else
echo -n "checking for automake $AM_NEEDED or later... " echo -n "checking for automake $AM_NEEDED or later... "
majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ`
minneeded=`echo $AM_NEEDED | $VERSIONMKMIN`
for am in automake-$AM_NEEDED automake$AM_NEEDED \ for am in automake-$AM_NEEDED automake$AM_NEEDED \
automake automake-1.7 automake-1.8 automake-1.9; do automake automake-1.7 automake-1.8 automake-1.9 automake-1.10; do
($am --version < /dev/null > /dev/null 2>&1) || continue ($am --version < /dev/null > /dev/null 2>&1) || continue
ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT` ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP`
verneeded=`echo $AM_NEEDED | $VERSIONMKINT` maj=`echo $ver | $VERSIONMKMAJ`
if test $ver -ge $verneeded; then min=`echo $ver | $VERSIONMKMIN`
if test $maj -eq $majneeded -a $min -ge $minneeded; then
AUTOMAKE=$am AUTOMAKE=$am
echo $AUTOMAKE echo $AUTOMAKE
break break
...@@ -56,11 +60,12 @@ if test -r Makefile.am; then ...@@ -56,11 +60,12 @@ if test -r Makefile.am; then
test -z $AUTOMAKE && echo "no" test -z $AUTOMAKE && echo "no"
echo -n "checking for aclocal $AM_NEEDED or later... " echo -n "checking for aclocal $AM_NEEDED or later... "
for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \ for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \
aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9; do aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 aclocal-1.10; do
($ac --version < /dev/null > /dev/null 2>&1) || continue ($ac --version < /dev/null > /dev/null 2>&1) || continue
ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT` ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP`
verneeded=`echo $AM_NEEDED | $VERSIONMKINT` maj=`echo $ver | $VERSIONMKMAJ`
if test $ver -ge $verneeded; then min=`echo $ver | $VERSIONMKMIN`
if test $maj -eq $majneeded -a $min -ge $minneeded; then
ACLOCAL=$ac ACLOCAL=$ac
echo $ACLOCAL echo $ACLOCAL
break break
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment