diff options
| -rwxr-xr-x | autogen.sh | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -21,6 +21,7 @@ echo "checking for autoconf... " } VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" +VERSIONMKINT="sed -e s/[^0-9]//" # do we need automake? if test -r Makefile.am; then @@ -39,8 +40,9 @@ if test -r Makefile.am; then 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 + ver=`$am --version < /dev/null | head -1 | $VERSIONGREP | $VERSIONMKINT` + verneeded=`echo $AM_NEEDED | $VERSIONMKINT` + if test $ver -ge $verneeded; then AUTOMAKE=$am echo $AUTOMAKE break @@ -50,8 +52,9 @@ if test -r Makefile.am; then 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 + ver=`$ac --version < /dev/null | head -1 | $VERSIONGREP | $VERSIONMKINT` + verneeded=`echo $AM_NEEDED | $VERSIONMKINT` + if test $ver -ge $verneeded; then ACLOCAL=$ac echo $ACLOCAL break |