diff options
author | Ralph Giles <giles@xiph.org> | 2006-04-26 16:58:54 +0000 |
---|---|---|
committer | Ralph Giles <giles@xiph.org> | 2006-04-26 16:58:54 +0000 |
commit | 61d78da8fa92e6eeac564301d44a092c8e96e444 (patch) | |
tree | c90535ac92a9e5d945b525d72e6c3eb4ded6e7f0 /autogen.sh | |
parent | b0fd4ab6c382708ea369bbe3dd30922d14c4745d (diff) | |
download | ogg-61d78da8fa92e6eeac564301d44a092c8e96e444.tar.gz |
Propagate fixes for when AUTOMAKE_OPTIONS doesn't list a minimum version number.
This is not currently relevent, but it's best to use our latest version.
git-svn-id: http://svn.xiph.org/trunk/ogg@11286 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -2,7 +2,7 @@ # Run this to set up the build system: configure, makefiles, etc. # (based on the version in enlightenment's cvs) -package="libogg" +package="vorbisdec" olddir=`pwd` srcdir=`dirname $0` @@ -25,16 +25,20 @@ VERSIONMKINT="sed -e s/[^0-9]//" # do we need automake? if test -r Makefile.am; then - AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP` + AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` + AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP` + if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then + AM_NEEDED="" + fi 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 "yes" + else echo "no" AUTOMAKE= - else - echo "yes" fi else echo -n "checking for automake $AM_NEEDED or later... " |