Modernize build

.gitignore

@@ -25,9 +25,15 @@ Makefile.in
 /missing
 /stamp-h1
 /m4/
+/ar-lib
+/build-aux
 
-/src/vcc_if.c
-/src/vcc_if.h
+/src/vcc_*_if.c
+/src/vcc_*_if.h
 /src/vmod_*rst
 /src/parse_algorithm.c
 /src/parse_algorithm.h
+/src/tests/*.log
+/src/tests/*.trs
+
+libvmod-blobdigest-*.tar.gz

Makefile.am

-ACLOCAL_AMFLAGS = -I m4 -I ${LIBVARNISHAPI_DATAROOTDIR}/aclocal
+ACLOCAL_AMFLAGS = -I m4 -I @VARNISHAPI_DATAROOTDIR@/aclocal
 
-SUBDIRS = src
+DISTCHECK_CONFIGURE_FLAGS = RST2MAN=:
 
-DISTCHECK_CONFIGURE_FLAGS = \
-	VMOD_DIR='$${libdir}/varnish/vmods'
+SUBDIRS = src
 
 EXTRA_DIST = README.rst LICENSE COPYING # vmod-blobdigest.spec debian
 
@@ -11,6 +10,7 @@ doc_DATA = README.rst LICENSE COPYING
 
 dist_man_MANS = vmod_blobdigest.3
 MAINTAINERCLEANFILES = $(dist_man_MANS)
+CLEANFILES = README.rst
 
 vmod_blobdigest.3: README.rst
 
@@ -21,11 +21,4 @@ src/vmod_blobdigest.man.rst:
 	make -C src vmod_blobdigest.man.rst
 
 %.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
-if HAVE_RST2MAN
 	${RST2MAN} $< $@
-else
-	@echo "========================================"
-	@echo "You need rst2man installed to make dist"
-	@echo "========================================"
-	@false
-endif

README.rst

 ..
 .. NB:  This file is machine generated, DO NOT EDIT!
 ..
-.. Edit ../src/vmod_blobdigest.vcc and run make instead
+.. Edit ./vmod_blobdigest.vcc and run make instead
 ..
 
 .. role:: ref(emphasis)

autogen.sh

 #!/bin/sh
 
-warn() {
-	echo "WARNING: $@" 1>&2
-}
+set -e
+set -u
 
-case `uname -s` in
-Darwin)
-	LIBTOOLIZE=glibtoolize
-	;;
-FreeBSD)
-	LIBTOOLIZE=libtoolize
-	;;
-Linux)
-	LIBTOOLIZE=libtoolize
-	;;
-SunOS)
-	LIBTOOLIZE=libtoolize
-	;;
-*)
-	warn "unrecognized platform:" `uname -s`
-	LIBTOOLIZE=libtoolize
-esac
-
-automake_version=`automake --version | tr ' ' '\n' | egrep '^[0-9]\.[0-9a-z.-]+'`
-if [ -z "$automake_version" ] ; then
-	warn "unable to determine automake version"
-else
-	case $automake_version in
-		0.*|1.[0-8]|1.[0-8][.-]*)
-			warn "automake ($automake_version) detected; 1.9 or newer recommended"
-			;;
-		*)
-			;;
-	esac
+if ! command -v libtoolize >/dev/null
+then
+	echo "libtoolize: command not found, falling back to glibtoolize" >&2
+	alias libtoolize=glibtoolize
 fi
 
-# check for varnishapi.m4 in custom paths
-dataroot=$(pkg-config --variable=datarootdir varnishapi 2>/dev/null)
-if [ -z "$dataroot" ] ; then
-	cat >&2 <<'EOF'
-Package varnishapi was not found in the pkg-config search path.
-Perhaps you should add the directory containing `varnishapi.pc'
-to the PKG_CONFIG_PATH environment variable
-EOF
-	exit 1
-fi
-set -ex
-aclocal -I m4 -I ${dataroot}/aclocal
-$LIBTOOLIZE --copy --force
+mkdir -p m4
+aclocal
+libtoolize --copy --force
 autoheader
 automake --add-missing --copy --foreign
 autoconf

configure.ac

@@ -2,14 +2,25 @@ AC_PREREQ([2.69])
 AC_COPYRIGHT([Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung])
 AC_INIT([libvmod-blobdigest],[1.1])
 AC_CONFIG_MACRO_DIR([m4])
-m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
+AC_CONFIG_AUX_DIR([build-aux])
+m4_ifndef([VARNISH_VMODS], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
 AC_CONFIG_SRCDIR(src/vmod_blobdigest.vcc)
 AC_CONFIG_HEADERS([config.h])
 
-AC_CANONICAL_TARGET
-AC_LANG(C)
+AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests])
+AM_SILENT_RULES([yes])
 
-AM_INIT_AUTOMAKE([foreign])
+AC_ARG_WITH([rst2man],
+	AS_HELP_STRING(
+		[--with-rst2man=PATH],
+		[Location of rst2man (auto)]),
+	[RST2MAN="$withval"],
+	[AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])])
+
+VARNISH_PREREQ([7.0.0])
+VARNISH_VMODS([blobdigest])
+
+AM_PROG_AR
 
 AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
 
@@ -19,16 +30,8 @@ CC="$PTHREAD_CC"
 
 LT_INIT([disable-static])
 AC_PROG_INSTALL
-LT_INIT
 AC_PROG_MAKE_SET
 
-# Check for rst utilities
-AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
-if test "x$RST2MAN" = "xno"; then
-	AC_MSG_WARN([rst2man not found - not building man pages])
-fi
-AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
-
 AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([unistd.h])
@@ -44,46 +47,6 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
-# Checks for libtool
-AC_PROG_CXX
-
-# backwards compat with older pkg-config
-# - pull in AC_DEFUN from pkg.m4
-m4_ifndef([PKG_CHECK_VAR], [
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-])
-
-PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
-PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
-PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
-PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
-PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
-AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
-
-# Varnish include files tree
-VARNISH_VMOD_INCLUDES
-VARNISH_VMOD_DIR
-VARNISH_VMODTOOL
-# inherit the prefix from Varnish.
-# acessing ac_ variable because AC_PREFIX_DEFAULT acts too early
-ac_default_prefix=$LIBVARNISHAPI_PREFIX
-
-AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
-    [$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
-AC_PATH_PROG([VARNISHD], [varnishd], [],
-    [$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
 
 # --enable-stack-protector
 AC_ARG_ENABLE(stack-protector,
@@ -116,6 +79,10 @@ if test "x$enable_debugging" != "xno"; then
 		[])
 fi
 
+VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
+AC_SUBST(VMOD_TESTS)
+AM_SUBST_NOTMAKE(VMOD_TESTS)
+
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile

src/Makefile.am

-AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror -std=c99
+AM_CFLAGS = $(VARNISHAPI_CFLAGS)
 
-vmoddir = @VMOD_DIR@
 vmod_LTLIBRARIES = libvmod_blobdigest.la
 
-libvmod_blobdigest_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+libvmod_blobdigest_la_LDFLAGS = $(VMOD_LDFLAGS)
 
 libvmod_blobdigest_la_SOURCES = \
 	vmod_blobdigest.h \
@@ -26,33 +25,24 @@ libvmod_blobdigest_la_SOURCES = \
 	sha3.c
 
 nodist_libvmod_blobdigest_la_SOURCES = \
-	vcc_if.c \
-	vcc_if.h
+	vcc_blobdigest_if.c \
+	vcc_blobdigest_if.h
 
-vmod_blobdigest.lo: vcc_if.c vcc_if.h
+@BUILD_VMOD_BLOBDIGEST@
 
-vcc_if.c: vcc_if.h
+# Test suite
 
-vcc_if.h vmod_blobdigest.man.rst: @VMODTOOL@ $(top_srcdir)/src/vmod_blobdigest.vcc
-	@PYTHON@ @VMODTOOL@ $(top_srcdir)/src/vmod_blobdigest.vcc
+AM_TESTS_ENVIRONMENT = \
+        PATH="$(abs_builddir):$(VARNISH_TEST_PATH):$(PATH)" \
+        LD_LIBRARY_PATH="$(VARNISH_LIBRARY_PATH)"
+TEST_EXTENSIONS = .vtc
+VTC_LOG_COMPILER = varnishtest -v
+AM_VTC_LOG_FLAGS = \
+        -p vcl_path="$(abs_top_srcdir)/vcl:$(VARNISHAPI_VCLDIR)" \
+        -p vmod_path="$(abs_builddir)/.libs:$(vmoddir):$(VARNISHAPI_VMODDIR)"
 
-VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc
-.PHONY: $(VMOD_TESTS)
+TESTS = @VMOD_TESTS@
 
-$(top_srcdir)/src/tests/*.vtc: libvmod_blobdigest.la
-	PATH=@LIBVARNISHAPI_SBINDIR@:$$PATH \
-	@VARNISHTEST@ -Dvmod_topbuild=$(abs_top_builddir) $@
-
-check: $(VMOD_TESTS)
-
-EXTRA_DIST = \
-	vmod_blobdigest.vcc \
-	$(VMOD_TESTS)
-
-CLEANFILES = \
-	$(builddir)/vcc_if.c \
-	$(builddir)/vcc_if.h \
-	$(builddir)/vmod_blobdigest.rst \
-	$(builddir)/vmod_blobdigest.man.rst \
-	$(builddir)/../vmod_blobdigest.3 \
-	$(builddir)/../README.rst
+dist_doc_DATA = \
+        vmod_blobdigest.vcc \
+        $(TESTS)

src/tests/00basic.vtc

@@ -5,7 +5,7 @@ varnishtest "vcl.use and .discard, and version string"
 server s1 {} -start
 
 varnish v1 -vcl+backend {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 } -start
 
 varnish v1 -vcl+backend {}
@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.discard vcl1"
 varnish v1 -cli "vcl.list"
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_recv {

src/tests/crc32.vtc

@@ -4,7 +4,7 @@ varnishtest "CRC32 checksum"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/d00017.vtc

@@ -25,7 +25,7 @@ server s3 {
 varnish v1 -vcl+backend {
 	import std;
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00020.vtc

@@ -17,7 +17,7 @@ server s3 {
 
 varnish v1 -vcl+backend {
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00021.vtc

@@ -21,7 +21,7 @@ server s3 {
 
 varnish v1 -vcl+backend {
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00022.vtc

@@ -29,7 +29,7 @@ server s3 {
 
 varnish v1 -vcl+backend {
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00023.vtc

@@ -20,7 +20,7 @@ server s3 {
 varnish v1 -vcl+backend {
 	import std;
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00024.vtc

@@ -22,7 +22,7 @@ server s3 {
 
 varnish v1 -vcl+backend {
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/d00026.vtc

@@ -17,7 +17,7 @@ server s3 {
 
 varnish v1 -vcl+backend {
 	import directors;
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/esi.vtc

@@ -20,7 +20,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {

src/tests/icrc32.vtc

@@ -4,7 +4,7 @@ varnishtest "inverted CRC32 checksum"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	import directors;
 	backend b { .host = "${bad_ip}"; }

src/tests/md5.vtc

@@ -4,7 +4,7 @@ varnishtest "MD5 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -253,7 +253,7 @@ server s1 -repeat 10 {
 } -start
 
 varnish v1 -vcl+backend {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {
@@ -335,7 +335,7 @@ client c1 -repeat 10 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -429,7 +429,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/rs.vtc

@@ -4,7 +4,7 @@ varnishtest "RS checksum"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	import directors;
 	backend b { .host = "${bad_ip}"; }

src/tests/sha1.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA1 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -285,7 +285,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -378,7 +378,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha224.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA224 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -251,7 +251,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -344,7 +344,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha256.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA256 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -236,7 +236,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -328,7 +328,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha256_bench.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA256 bench"
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha3-224.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA3_224 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -236,7 +236,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -339,7 +339,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha3-256.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA3_256 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -236,7 +236,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -340,7 +340,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha3-384.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA3_384 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -236,7 +236,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -341,7 +341,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha3-512.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA3_512 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -236,7 +236,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -340,7 +340,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha384.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA384 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -221,7 +221,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -313,7 +313,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/sha512.vtc

@@ -4,7 +4,7 @@ varnishtest "SHA512 hash"
 
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -221,7 +221,7 @@ client c1 {
 
 # hmac object
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -313,7 +313,7 @@ client c1 {
 
 # hmacf function
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 

src/tests/usage.vtc

@@ -6,7 +6,7 @@ varnishtest "usage restrictions"
 
 # Test use of digest object methods in vcl_init and _fini
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -62,7 +62,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 
 	sub vcl_init {
@@ -143,7 +143,7 @@ logexpect l0 -v v1 -d 1 -g vxid -q "VCL_Error" {
 
 # digest.update() may not be called after digest.final()
 varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -166,7 +166,7 @@ varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
 }
 
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend b { .host = "${bad_ip}"; }
 
@@ -209,7 +209,7 @@ logexpect l1 -wait
 
 # hash() is legal in vcl_init and vcl_fini (as of Varnish 5.0)
 varnish v2 -arg "-p debug=+vclrel" -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	import std;
 	backend b { .host = "${bad_ip}"; }
@@ -252,7 +252,7 @@ varnish v2 -stop
 # # broken in varnish-cache master - but phk does not accept
 # # ref: https://github.com/varnishcache/varnish-cache/pull/2941
 # varnish v1 -errvcl {vmod blobdigest error: key is NULL in fail constructor} {
-#	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+#	import blobdigest;
 #	import blob;
 #	backend b { .host = "${bad_ip}"; }
 #
@@ -263,7 +263,7 @@ varnish v2 -stop
 
 # hmac method and hmacf function fail if msg or key is NULL
 varnish v1 -vcl {
-	import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
+	import blobdigest;
 	import blob;
 	backend bk { .host = "${bad_ip}"; }
 

src/vmod_blobdigest.c

@@ -36,7 +36,7 @@
 #include "vsb.h"
 #include "vtim.h"
 
-#include "vcc_if.h"
+#include "vcc_blobdigest_if.h"
 #include "vmod_blobdigest.h"
 
 #include "byte_order.h"