Uppdate tooling

this brings us closer to vcdk

.gitignore

-Makefile
-Makefile.in
+# build system
+
 .deps/
 .libs/
-*.o
-*.lo
+autom4te.cache/
+build-aux/
+m4/
+
 *.la
-*~
-*.[1-9]
-
-/aclocal.m4
-/autom4te.cache/
-/compile
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/stamp-h1
-/m4/libtool.m4
-/m4/lt*.m4
-
-/src/vcc_if.c
-/src/vcc_if.h
-/src/vmod_*rst
+*.lo
+*.o
+*.tar.gz
+
+Makefile
+Makefile.in
+aclocal.m4
+config.h
+config.h.in
+config.log
+config.status
+configure
+libtool
+stamp-h1
+
+# test suite
+
+*.log
+*.trs
+
+# vmodtool
+
+vcc_*_if.[ch]
+vmod_*.rst
+
+# man
+
+*.1
+*_options.rst
+*_synopsis.rst
+vmod_*.3

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
 
 doc_DATA = README.rst LICENSE
-
-dist_man_MANS = vmod_hoailona.3
-MAINTAINERCLEANFILES = $(dist_man_MANS)
-
-vmod_hoailona.3: README.rst
-
-README.rst: src/vmod_hoailona.man.rst
-	cp src/vmod_hoailona.man.rst README.rst
-
-src/vmod_hoailona.man.rst:
-	make -C src vmod_hoailona.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

configure.ac

-AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2017 UPLEX - Nils Goroll Systemoptimierung])
-AC_INIT([libvmod-hoailona], [0.2])
+AC_PREREQ([2.69])
+AC_COPYRIGHT([Copyright 2017 - 2023 UPLEX - Nils Goroll Systemoptimierung])
+AC_INIT([libvmod-hoailona],[0.2])
 AC_CONFIG_MACRO_DIR([m4])
-m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
-AC_CONFIG_SRCDIR(src/vmod_hoailona.vcc)
-AM_CONFIG_HEADER(config.h)
-
-AC_CANONICAL_SYSTEM
-AC_LANG(C)
-
-AM_INIT_AUTOMAKE([foreign])
-
-AC_GNU_SOURCE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AC_PROG_CC_C99
+AC_CONFIG_SRCDIR([src/vmod_hoailona.vcc])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([config.h])
+AC_USE_SYSTEM_EXTENSIONS
+
+AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests])
+AM_SILENT_RULES([yes])
+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([6.0.0])
+VARNISH_VMODS([hoailona])
+
+AM_PROG_AR
 if test "x$ac_cv_prog_cc_c99" = xno; then
 	AC_MSG_ERROR([Could not find a C99 compatible compiler])
 fi
-AC_PROG_CPP
 
 AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
 
@@ -26,20 +30,12 @@ LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 CC="$PTHREAD_CC"
 
-LT_INIT([disable-static])
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+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"])
-
-# Checks for header files.
-AC_HEADER_STDC
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen disable-static])
 
 # Checks for C sources
 AC_CHECK_FUNCS([memset])
@@ -52,44 +48,6 @@ AC_TYPE_SIZE_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,
        AS_HELP_STRING([--enable-stack-protector],[enable stack protector (default is YES)]),
@@ -125,4 +83,19 @@ AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 ])
+
 AC_OUTPUT
+
+AS_ECHO("
+	==== $PACKAGE_STRING ====
+
+	varnish:      $VARNISH_VERSION
+	prefix:       $prefix
+	vmoddir:      $vmoddir
+	vcldir:       $vcldir
+	pkgvcldir:    $pkgvcldir
+
+	compiler:     $CC
+	cflags:       $CFLAGS
+	ldflags:      $LDFLAGS
+")

src/Makefile.am

-AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror -Wextra -std=c99
+AM_CFLAGS = $(VARNISHAPI_CFLAGS)
 
-vmoddir = @VMOD_DIR@
-vmod_LTLIBRARIES = libvmod_hoailona.la
+# Modules
 
-libvmod_hoailona_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+vmod_LTLIBRARIES = \
+	libvmod_hoailona.la
+
+libvmod_hoailona_la_LDFLAGS = \
+	$(VMOD_LDFLAGS) -module -export-dynamic -avoid-version -shared
 
 libvmod_hoailona_la_SOURCES = \
 	vmod_hoailona.c \
 	vmod_hoailona.h \
-	vtree.h \
 	pattern.c
 
 nodist_libvmod_hoailona_la_SOURCES = \
-	vcc_if.c \
-	vcc_if.h
-
-vmod_hoailona.lo: vcc_if.c vcc_if.h
-
-vcc_if.c: vcc_if.h
-
-vcc_if.h vmod_hoailona.man.rst: @VMODTOOL@ $(top_srcdir)/src/vmod_hoailona.vcc
-	@PYTHON@ @VMODTOOL@ $(top_srcdir)/src/vmod_hoailona.vcc
-
-VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc
-.PHONY: $(VMOD_TESTS)
-
-$(top_srcdir)/src/tests/*.vtc: libvmod_hoailona.la
-	PATH=@LIBVARNISHAPI_SBINDIR@:$$PATH \
-	@VARNISHTEST@ -Dvmod_topbuild=$(abs_top_builddir) $@
+	vcc_hoailona_if.c \
+	vcc_hoailona_if.h
+
+@BUILD_VMOD_HOAILONA@
+
+# Test suite
+
+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)"
+
+TESTS = \
+	tests/00basic.vtc \
+	tests/add.vtc \
+	tests/explain.vtc \
+	tests/policy_method.vtc \
+	tests/policy_obj.vtc \
+	tests/secret.vtc \
+	tests/token.vtc
+
+# Documentation
+
+dist_doc_DATA = \
+	vmod_hoailona.vcc \
+	$(TESTS)
 
-check: $(VMOD_TESTS)
+dist_man_MANS = \
+	vmod_hoailona.3
 
-EXTRA_DIST = \
-	vmod_hoailona.vcc \
-	$(VMOD_TESTS)
 
-CLEANFILES = \
-	$(builddir)/vcc_if.c \
-	$(builddir)/vcc_if.h \
-	$(builddir)/vmod_hoailona.rst \
-	$(builddir)/vmod_hoailona.man.rst
+.rst.1:
+	$(AM_V_GEN) $(RST2MAN) $< $@

src/tests/00basic.vtc

@@ -5,7 +5,7 @@ varnishtest "vcl.use and .discard, and version string"
 server s1 {} -start
 
 varnish v1 -vcl+backend {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 } -start
 
 varnish v1 -vcl+backend {}
@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.discard vcl1"
 varnish v1 -cli "vcl.list"
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_recv {

src/tests/add.vtc

@@ -3,7 +3,7 @@
 varnishtest "hosts.add()"
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -19,7 +19,7 @@ varnish v1 -vcl {
 } -start
 
 varnish v1 -errvcl {Not available in subroutine 'vcl_recv'} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -33,7 +33,7 @@ varnish v1 -errvcl {Not available in subroutine 'vcl_recv'} {
 }
 
 varnish v1 -errvcl {vmod hoailona error: host is empty in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -44,7 +44,7 @@ varnish v1 -errvcl {vmod hoailona error: host is empty in h.add()} {
 }
 
 varnish v1 -errvcl {vmod hoailona error: policy is empty in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -55,7 +55,7 @@ varnish v1 -errvcl {vmod hoailona error: policy is empty in h.add()} {
 }
 
 varnish v1 -errvcl {vmod hoailona error: path is set but empty in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -66,7 +66,7 @@ varnish v1 -errvcl {vmod hoailona error: path is set but empty in h.add()} {
 }
 
 varnish v1 -errvcl {vmod hoailona error: path ""<>?\^`| in h.add(): invalid character(s) in pattern: ""<>?\^`|} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -77,7 +77,7 @@ varnish v1 -errvcl {vmod hoailona error: path ""<>?\^`| in h.add(): invalid char
 }
 
 varnish v1 -errvcl {vmod hoailona error: path /x... in h.add(): ... must only be used before and after slashes: x...} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -88,7 +88,7 @@ varnish v1 -errvcl {vmod hoailona error: path /x... in h.add(): ... must only be
 }
 
 varnish v1 -errvcl {vmod hoailona error: path /.../...x in h.add(): ... must only be used before and after slashes: ...x} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -99,7 +99,7 @@ varnish v1 -errvcl {vmod hoailona error: path /.../...x in h.add(): ... must onl
 }
 
 varnish v1 -errvcl {vmod hoailona error: path /x/**/y in h.add(): more than one *: /**/} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -110,7 +110,7 @@ varnish v1 -errvcl {vmod hoailona error: path /x/**/y in h.add(): more than one
 }
 
 varnish v1 -errvcl {vmod hoailona error: No policy objects created before calling h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -120,7 +120,7 @@ varnish v1 -errvcl {vmod hoailona error: No policy objects created before callin
 }
 
 varnish v1 -errvcl {vmod hoailona error: Policy object q not found in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -131,7 +131,7 @@ varnish v1 -errvcl {vmod hoailona error: Policy object q not found in h.add()} {
 }
 
 varnish v1 -errvcl {vmod hoailona error: Policy p already set globally for host example.com in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -144,7 +144,7 @@ varnish v1 -errvcl {vmod hoailona error: Policy p already set globally for host
 }
 
 varnish v1 -errvcl {vmod hoailona error: Path-specific policies already set for host example.com in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -157,7 +157,7 @@ varnish v1 -errvcl {vmod hoailona error: Path-specific policies already set for
 }
 
 varnish v1 -errvcl {vmod hoailona error: Policy p already assigned for host example.com and path /foo/bar in h.add()} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -172,7 +172,7 @@ varnish v1 -errvcl {vmod hoailona error: Policy p already assigned for host exam
 # The following assignments are legal since the paths don't compare as
 # equal.
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -185,7 +185,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -198,7 +198,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -211,7 +211,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -224,7 +224,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -237,7 +237,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -250,7 +250,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -264,7 +264,7 @@ varnish v1 -vcl {
 
 # Test valid hostnames
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -277,7 +277,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {invalid hostname -example.com: may not begin with - or .} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -288,7 +288,7 @@ varnish v1 -errvcl {invalid hostname -example.com: may not begin with - or .} {
 }
 
 varnish v1 -errvcl {invalid hostname .example.com: may not begin with - or .} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -299,7 +299,7 @@ varnish v1 -errvcl {invalid hostname .example.com: may not begin with - or .} {
 }
 
 varnish v1 -errvcl {invalid hostname *.*.example.com: illegal characters} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -310,7 +310,7 @@ varnish v1 -errvcl {invalid hostname *.*.example.com: illegal characters} {
 }
 
 varnish v1 -errvcl {invalid hostname example-%.com: illegal characters} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -321,7 +321,7 @@ varnish v1 -errvcl {invalid hostname example-%.com: illegal characters} {
 }
 
 varnish v1 -errvcl {invalid hostname example-ä.com: illegal characters} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {

src/tests/explain.vtc

@@ -3,7 +3,7 @@
 varnishtest "hosts.explain()"
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -90,7 +90,7 @@ client c1 {
 } -run
 
 varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -103,7 +103,7 @@ varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {

src/tests/policy_method.vtc

@@ -3,7 +3,7 @@
 varnishtest "hosts.policy()"
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -46,7 +46,7 @@ client c1 {
 
 # Examples from Akamai docs
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -87,7 +87,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -123,7 +123,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -157,7 +157,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -191,7 +191,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -233,7 +233,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -277,7 +277,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -311,7 +311,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -351,7 +351,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -388,7 +388,7 @@ client c1 {
 
 # Usage tests
 varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -402,7 +402,7 @@ varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {

src/tests/policy_obj.vtc

@@ -5,7 +5,7 @@ varnishtest "policy object constructor"
 
 # Doesn't test much, just make sure nothing crashes
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import blob;
 	backend proforma none;
 
@@ -28,7 +28,7 @@ varnish v1 -vcl { backend proforma none; }
 varnish v1 -cli "vcl.discard vcl1"
 
 varnish v1 -errvcl {ttl must be >= 0 when type is TOKEN in p constructor} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {

src/tests/secret.vtc

@@ -4,7 +4,7 @@ varnishtest "hosts.secret()"
 
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import blob;
 	backend proforma none;
 
@@ -35,7 +35,7 @@ client c1 {
 
 # Usage
 varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import blob;
 	backend proforma none;
 
@@ -49,7 +49,7 @@ varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import blob;
 	backend proforma none;
 

src/tests/token.vtc

@@ -3,7 +3,7 @@
 varnishtest "hosts.token()"
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import std;
 	backend proforma none;
 
@@ -40,7 +40,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -74,7 +74,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import std;
 	backend proforma none;
 
@@ -111,7 +111,7 @@ client c1 {
 } -run
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import std;
 	backend proforma none;
 
@@ -155,7 +155,7 @@ client c1 {
 
 # Usage
 varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	backend proforma none;
 
 	sub vcl_init {
@@ -168,7 +168,7 @@ varnish v1 -errvcl {Not available in subroutine 'vcl_init'} {
 }
 
 varnish v1 -vcl {
-	import hoailona from "${vmod_topbuild}/src/.libs/libvmod_hoailona.so";
+	import hoailona;
 	import std;
 	backend proforma none;
 

src/vmod_hoailona.c

@@ -33,7 +33,7 @@
 
 #include "vmod_hoailona.h"
 #include "vas.h"
-#include "vcc_if.h"
+#include "vcc_hoailona_if.h"
 
 #define epfx "vmod hoailona error: "