diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 12:58:46 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 12:58:46 +0200 |
commit | 5b214e3d72f9e261a37cf31deb41e7f8a61a1811 (patch) | |
tree | 7cbd83619a7675ea83ff5a8360a065475655e425 | |
parent | 5f6dce2f7dd35a154333bb42d134a018b981f812 (diff) | |
download | acvmod-5b214e3d72f9e261a37cf31deb41e7f8a61a1811.tar.gz acvmod-5b214e3d72f9e261a37cf31deb41e7f8a61a1811.tar.bz2 |
Fix version comparison in AM_VARNISHAPI. Improve diagnostics.
-rw-r--r-- | varnishapi.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/varnishapi.m4 b/varnishapi.m4 index 8a00c8f..147230c 100644 --- a/varnishapi.m4 +++ b/varnishapi.m4 @@ -35,14 +35,11 @@ m4_define([VAPI_CHECK_VER],[ varnishapi_version_diff=older - elif test $VARNISHAPI_MINOR -gt $2; then + ])elif test $VARNISHAPI_MINOR -gt m4_if([$2],,0,[$2]); then varnishapi_version_diff=newer - ])m4_if([$3],,,[elif test $VARNISHAPI_PATCH -lt $3; then + m4_if([$3],,,[elif test $VARNISHAPI_PATCH -lt $3; then varnishapi_version_diff=older - elif test $VARNISHAPI_PATCH -gt $3; then + ])elif test $VARNISHAPI_PATCH -gt m4_if([$3],,0,[$3]); then varnishapi_version_diff=newer - ])else + else varnishapi_version_diff=same fi - if test $varnishapi_version_diff = older; then - AC_MSG_ERROR([unsupported varnishapi version $VARNISHAPI_MAJOR.$VARNISHAPI_MINOR.$VARNISHAPI_PATCH]) - fi ])]) @@ -107,2 +104,5 @@ AC_DEFUN([AM_VARNISHAPI], VAPI_CHECK_VER(m4_unquote(m4_split(m4_if([ver],AC_PACKAGE_VERSION,[$1],[$1],,[ver],[$1]),\.))) + if test $varnishapi_version_diff = older; then + AC_MSG_ERROR([varnishapi version too old: $VARNISHAPI_MAJOR.$VARNISHAPI_MINOR.$VARNISHAPI_PATCH; required at least $1]) + fi @@ -164,3 +164,3 @@ if test "$varnishapi_version_diff" = newer; then WARNING: This version is newer than the latest version for which -$PACKAGE_STRING was tested. If it doesn't compile, please send a mail to +$PACKAGE_STRING was tested ($2). If it doesn't compile, please report it to <$PACKAGE_BUGREPORT>. |