diff options
-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 | |||
@@ -34,16 +34,13 @@ m4_define([VAPI_CHECK_VER],[ | |||
34 | m4_if([$2],,,[elif test $VARNISHAPI_MINOR -lt $2; then | 34 | m4_if([$2],,,[elif test $VARNISHAPI_MINOR -lt $2; then |
35 | varnishapi_version_diff=older | 35 | varnishapi_version_diff=older |
36 | elif test $VARNISHAPI_MINOR -gt $2; then | 36 | ])elif test $VARNISHAPI_MINOR -gt m4_if([$2],,0,[$2]); then |
37 | varnishapi_version_diff=newer | 37 | varnishapi_version_diff=newer |
38 | ])m4_if([$3],,,[elif test $VARNISHAPI_PATCH -lt $3; then | 38 | m4_if([$3],,,[elif test $VARNISHAPI_PATCH -lt $3; then |
39 | varnishapi_version_diff=older | 39 | varnishapi_version_diff=older |
40 | elif test $VARNISHAPI_PATCH -gt $3; then | 40 | ])elif test $VARNISHAPI_PATCH -gt m4_if([$3],,0,[$3]); then |
41 | varnishapi_version_diff=newer | 41 | varnishapi_version_diff=newer |
42 | ])else | 42 | else |
43 | varnishapi_version_diff=same | 43 | varnishapi_version_diff=same |
44 | fi | 44 | fi |
45 | if test $varnishapi_version_diff = older; then | ||
46 | AC_MSG_ERROR([unsupported varnishapi version $VARNISHAPI_MAJOR.$VARNISHAPI_MINOR.$VARNISHAPI_PATCH]) | ||
47 | fi | ||
48 | ])]) | 45 | ])]) |
49 | 46 | ||
@@ -106,4 +103,7 @@ AC_DEFUN([AM_VARNISHAPI], | |||
106 | 103 | ||
107 | VAPI_CHECK_VER(m4_unquote(m4_split(m4_if([ver],AC_PACKAGE_VERSION,[$1],[$1],,[ver],[$1]),\.))) | 104 | VAPI_CHECK_VER(m4_unquote(m4_split(m4_if([ver],AC_PACKAGE_VERSION,[$1],[$1],,[ver],[$1]),\.))) |
105 | if test $varnishapi_version_diff = older; then | ||
106 | AC_MSG_ERROR([varnishapi version too old: $VARNISHAPI_MAJOR.$VARNISHAPI_MINOR.$VARNISHAPI_PATCH; required at least $1]) | ||
107 | fi | ||
108 | 108 | ||
109 | m4_if([$2],,[m4_if(ver,AC_PACKAGE_VERSION,[# Suppress the warning message | 109 | m4_if([$2],,[m4_if(ver,AC_PACKAGE_VERSION,[# Suppress the warning message |
@@ -163,5 +163,5 @@ if test "$varnishapi_version_diff" = newer; then | |||
163 | fmt <<EOT | 163 | fmt <<EOT |
164 | WARNING: This version is newer than the latest version for which | 164 | WARNING: This version is newer than the latest version for which |
165 | $PACKAGE_STRING was tested. If it doesn't compile, please send a mail to | 165 | $PACKAGE_STRING was tested ($2). If it doesn't compile, please report it to |
166 | <$PACKAGE_BUGREPORT>. | 166 | <$PACKAGE_BUGREPORT>. |
167 | EOT | 167 | EOT |