Support for varnish 5.1.release-1.1

* configure.ac: Set version 1.1
(AC_VMOD_BASENAME): New subst variable.
* NEWS: Document changes.
* README: Document changes.
* acvmod: Update.
* tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4
* tests/atlocal.in: Add @VARNISH_SBINDIR@ to PATH.
* tests/ci.at: Update.
* tests/cs.at: Update.

8 files changed, 15 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 3a8e71e..ca8f679 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,18 @@
-vmod_dict -- history of user-visible changes. 2017-08-06
+vmod_dict -- history of user-visible changes. 2017-08-10
 Copyright (C) 2017 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send vmod_dict bug reports to <gray@gnu.org>
 
 
+Version 1.1, 2017-08-10
+
+* Support for Varnish 5.1
+
+
 Version 1.0, 2017-08-06
 
 Initial release
 
 =========================================================================
 Copyright information:
diff --git a/README b/README
index bf98aab..2109a6b 100644
--- a/README
+++ b/README
@@ -38,13 +38,14 @@ as follows:
 
    set req.http.X-Value = dict.lookup("key");
 
 * Installation
 
 In order to compile the package you need to have installed
-varnishd and varnishapi package.
+varnishd and varnishapi package. The module has been tested with
+Varnish versions 4.1 and 5.1.
 
 Supposing that condition is met, run:
 
   ./configure
 
 It should be able to automatically find the necessary components. In case 
diff --git a/acvmod b/acvmod
-Subproject ba32780019480b89cd9d796b93a76cae6afe99a
+Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
diff --git a/configure.ac b/configure.ac
index 30e9bc0..5d50849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,18 +12,19 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with vmod_dict.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.69)
-AC_INIT([vmod-dict], [1.0], [gray@gnu.org])
+AC_INIT([vmod-dict], [1.1], [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_dict.vcc)
 AM_CONFIG_HEADER(config.h)
 
+AC_SUBST([AC_VMOD_BASENAME],[dict])
 AC_CANONICAL_SYSTEM
 AC_LANG(C)
 
 AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules])
 AM_SILENT_RULES([yes])
 
@@ -41,13 +42,13 @@ AC_PROG_MAKE_SET
 
 # Checks for header files.
 AC_HEADER_STDC
 
 # Check for functions
 
-AM_VARNISHAPI([4.1])
+AM_VARNISHAPI([4.1],[5.1])
 
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 AC_CONFIG_FILES([
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d70517f..6c5967c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,12 +28,13 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
           echo '# Signature of the current package.'; \
           echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
           echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
           echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
           echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
           echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+          echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \
         } >$(srcdir)/package.m4
 
 #
 
 ## ------------ ##
 ## Test suite.  ##
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 142b9ed..5d6b7f3 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,7 +1,7 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for vmod_dict test suite.
 # Copyright (C) 2017 Sergey Poznyakoff
 
-PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH
+PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
 VARNISHTEST=@VARNISHTEST@
 VARNISHD=@VARNISHD@
diff --git a/tests/ci.at b/tests/ci.at
index d486188..1115316 100644
--- a/tests/ci.at
+++ b/tests/ci.at
@@ -1,9 +1,9 @@
 AT_SETUP([case-insensitive])
 AT_KEYWORDS([case-insensitive])
-AT_VARNISHTEST([dict],[
+AT_VARNISHTEST([
         sub vcl_init {
                 dict.ci(true);
                 dict.collisions(0);
                 dict.load("\${vmod_topsrc}/tests/num.dict");
         }
         sub vcl_recv {
diff --git a/tests/cs.at b/tests/cs.at
index 0333943..11366c4 100644
--- a/tests/cs.at
+++ b/tests/cs.at
@@ -1,9 +1,9 @@
 AT_SETUP([case-sensitive])
 AT_KEYWORDS([case-sensitive])
-AT_VARNISHTEST([dict],[
+AT_VARNISHTEST([
         sub vcl_init {
                 dict.collisions(0);
                 dict.load("\${vmod_topsrc}/tests/num.dict");
         }
         sub vcl_recv {
                 set req.http.X-result = dict.lookup(regsub(req.url, "^/(.*)", "\1"));