diff options
| author | Ralph Giles <giles@xiph.org> | 2006-06-20 19:42:23 +0000 |
|---|---|---|
| committer | Ralph Giles <giles@xiph.org> | 2006-06-20 19:42:23 +0000 |
| commit | 43b91dfc34fb9c0c9a51bfc2271b76dbd14d39c8 (patch) | |
| tree | 54c6ac16b07568b61ac13d1ea54461b3547c5664 /autogen.sh | |
| parent | da2076e9525dd3dadb36f21e24e015c77ab978ce (diff) | |
| download | ogg-43b91dfc34fb9c0c9a51bfc2271b76dbd14d39c8.tar.gz | |
Propagate extended automake detection fix from theora-1.0alpha7.
git-svn-id: http://svn.xiph.org/trunk/ogg@11598 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -42,7 +42,8 @@ if test -r Makefile.am; then fi else echo -n "checking for automake $AM_NEEDED or later... " - for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do + for am in automake-$AM_NEEDED automake$AM_NEEDED \ + automake automake-1.7 automake-1.8 automake-1.9; do ($am --version < /dev/null > /dev/null 2>&1) || continue ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT` verneeded=`echo $AM_NEEDED | $VERSIONMKINT` @@ -54,7 +55,8 @@ if test -r Makefile.am; then 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 + for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \ + aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9; do ($ac --version < /dev/null > /dev/null 2>&1) || continue ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT` verneeded=`echo $AM_NEEDED | $VERSIONMKINT` |