Commit 71fffbbe authored by Geoff Simmons's avatar Geoff Simmons

enforce Varnish >= 4.1.2 in the configure step

parent 312e1f89
Pipeline #84 skipped
...@@ -416,6 +416,10 @@ REQUIREMENTS ...@@ -416,6 +416,10 @@ REQUIREMENTS
This VMOD requires at least Varnish version 4.1.2, and has been tested This VMOD requires at least Varnish version 4.1.2, and has been tested
with versions through 5.0.0. with versions through 5.0.0.
Later versions of this VMOD are only compatible with Varnish versions
since 5.0.0, and permit the use of the ``encode``, ``decode`` and
``transcode`` functions in ``vcl_init``.
Perl 5 is required for the build. Perl 5 is required for the build.
INSTALLATION INSTALLATION
...@@ -502,6 +506,8 @@ HISTORY ...@@ -502,6 +506,8 @@ HISTORY
* version 0.1: initial version * version 0.1: initial version
* version 1.0: compatible with Varnish versions since 4.1.2.
SEE ALSO SEE ALSO
======== ========
...@@ -516,3 +522,4 @@ This document is licensed under the same conditions as the ...@@ -516,3 +522,4 @@ This document is licensed under the same conditions as the
libvmod-blobcode project. See LICENSE for details. libvmod-blobcode project. See LICENSE for details.
* Copyright (c) 2015-2016 UPLEX Nils Goroll Systemoptimierung * Copyright (c) 2015-2016 UPLEX Nils Goroll Systemoptimierung
...@@ -65,7 +65,8 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ...@@ -65,7 +65,8 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR ])# PKG_CHECK_VAR
]) ])
PKG_CHECK_MODULES([libvarnishapi], [varnishapi]) PKG_CHECK_MODULES([libvarnishapi], [varnishapi = trunk], [],
[PKG_CHECK_MODULES([libvarnishapi], [varnishapi >= 4.1.2])])
PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix]) PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir]) PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir]) PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
......
...@@ -145,7 +145,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend { ...@@ -145,7 +145,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend {
} -start } -start
logexpect l1 -v v1 { logexpect l1 -v v1 {
expect * 1001 VCL_Log "^Using VMOD blobcode version 0.1" expect * 1001 VCL_Log "^Using VMOD blobcode version \S+"
} -start } -start
client c1 { client c1 {
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
$Module blobcode 3 binary-to-text encodings and decodings for the VCL blob type $Module blobcode 3 binary-to-text encodings and decodings for the VCL blob type
$Event event
:: ::
sub vcl_init { sub vcl_init {
...@@ -463,3 +461,5 @@ This document is licensed under the same conditions as the ...@@ -463,3 +461,5 @@ This document is licensed under the same conditions as the
libvmod-blobcode project. See LICENSE for details. libvmod-blobcode project. See LICENSE for details.
* Copyright (c) 2015-2016 UPLEX Nils Goroll Systemoptimierung * Copyright (c) 2015-2016 UPLEX Nils Goroll Systemoptimierung
$Event event
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment