Use the new autoconf macros

.gitignore

@@ -7,6 +7,8 @@ Makefile.in
 *.la
 *~
 *.[1-9]
+*.log
+*.trs
 
 /aclocal.m4
 /autom4te.cache/
@@ -24,6 +26,6 @@ Makefile.in
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
 
-/src/vcc_if.c
-/src/vcc_if.h
+/src/vcc_*_if.c
+/src/vcc_*_if.h
 /src/vmod_*rst

Makefile.am

-ACLOCAL_AMFLAGS = -I m4 -I ${LIBVARNISHAPI_DATAROOTDIR}/aclocal
+ACLOCAL_AMFLAGS = -I m4 -I ${VARNISHAPI_DATAROOTDIR}/aclocal
 
 SUBDIRS = src
 
-DISTCHECK_CONFIGURE_FLAGS = \
-	VMOD_DIR='$${libdir}/varnish/vmods'
-
 EXTRA_DIST = README.rst LICENSE
 
 doc_DATA = README.rst LICENSE

configure.ac

@@ -2,7 +2,6 @@ AC_PREREQ([2.68])
 AC_INIT([libvmod-example], [0.1], [], [vmod-example])
 AC_COPYRIGHT([Copyright (c) 2011-2016 Varnish Software AS])
 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])
 AC_CONFIG_SRCDIR(src/vmod_example.vcc)
 AC_CONFIG_HEADER([config.h])
@@ -27,27 +26,14 @@ if test "x$RST2MAN" = "xno"; then
 	AC_MSG_ERROR([rst2man not found - cannot build man pages])
 fi
 
+m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
+
+VARNISH_PREREQ([4.1.3])
+VARNISH_VMODS([example])
+
 VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
 AC_SUBST(VMOD_TESTS)
 
-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:$PATH])
-AC_PATH_PROG([VARNISHD], [varnishd], [], [$LIBVARNISHAPI_SBINDIR:$PATH])
-
 PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
 AC_SUBST([VARNISH_LIBRARY_PATH],
 	[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])

src/Makefile.am

-AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror
+AM_CFLAGS = $(VARNISHAPI_CFLAGS) -Wall -Werror
+AM_LDFLAGS = $(VARNISHAPI_LIBS) $(VMOD_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
 
-TESTS_ENVIRONMENT = PATH=$(LIBVARNISHAPI_BINDIR):$(LIBVARNISHAPI_SBINDIR):$$PATH
-
-vmoddir = @VMOD_DIR@
 vmod_LTLIBRARIES = libvmod_example.la
 
-libvmod_example_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-
 libvmod_example_la_SOURCES = \
 	vmod_example.c
 
 nodist_libvmod_example_la_SOURCES = \
-	vcc_if.c \
-	vcc_if.h
+	vcc_example_if.c \
+	vcc_example_if.h
 
 dist_man_MANS = vmod_example.3
 
-vmod_example.3: vmod_example.man.rst
-	${RST2MAN} $< $@
-
-vmod_example.lo: vcc_if.c
-
-vmod_example.man.rst vcc_if.c: vcc_if.h
+@BUILD_VMOD_EXAMPLE@
 
-vcc_if.h: @VMODTOOL@ $(top_srcdir)/src/vmod_example.vcc
-	@PYTHON@ @VMODTOOL@ $(top_srcdir)/src/vmod_example.vcc
-
-AM_TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(VARNISH_LIBRARY_PATH)"
-VTC_LOG_COMPILER = $(VARNISHTEST) -v \
-	-Dvmod_topbuild=$(abs_top_builddir)
+AM_TESTS_ENVIRONMENT = \
+	PATH="$(VMOD_TEST_PATH)" \
+	LD_LIBRARY_PATH="$(VARNISH_LIBRARY_PATH)"
 TEST_EXTENSIONS = .vtc
-TESTS = @VMOD_TESTS@
+VTC_LOG_COMPILER = varnishtest -v
+AM_VTC_LOG_FLAGS = -Dvmod_example="$(VMOD_EXAMPLE)"
 
-@VMOD_TESTS@: vmod_example.lo
+TESTS = @VMOD_TESTS@
 
 EXTRA_DIST = \
 	vmod_example.vcc \
 	$(VMOD_TESTS)
-
-CLEANFILES = \
-	$(builddir)/vcc_if.c \
-	$(builddir)/vcc_if.h \
-	$(builddir)/vmod_example.rst \
-	$(builddir)/vmod_example.man.rst \
-	$(dist_man_MANS)

src/tests/test01.vtc

@@ -7,7 +7,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	import std;
-	import example from "${vmod_topbuild}/src/.libs/libvmod_example.so";
+	import ${vmod_example};
 
 	sub vcl_init {
 		std.log(example.info());

src/vmod_example.c

@@ -9,7 +9,7 @@
 #include "cache/cache.h"
 
 #include "vtim.h"
-#include "vcc_if.h"
+#include "vcc_example_if.h"
 
 const size_t infosz = 64;
 char	     *info;