From 024e274dc9b910cbb3649c2b8d1af804c09d7780 Mon Sep 17 00:00:00 2001
From: Geoff Simmons <geoff@uplex.de>
Date: Tue, 18 Aug 2015 13:40:41 +0200
Subject: [PATCH 1/3] use pkg-config in configure to locate varnishd and
 varnishtest

---
 configure.ac | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 026f535..39e7e24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,32 @@ VARNISH_VMOD_INCLUDES
 VARNISH_VMOD_DIR
 VARNISH_VMODTOOL
 
-AC_PATH_PROG([VARNISHTEST], [varnishtest])
-AC_PATH_PROG([VARNISHD], [varnishd])
+# 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_BINDIR], [varnishapi], [bindir])
+PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
+
+AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
+    [$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
+AC_PATH_PROG([VARNISHD], [varnishd], [],
+    [$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
 
 AC_CONFIG_FILES([
 	Makefile

From 676017073961579c3ef0cbb440a8bc52d43ed2a9 Mon Sep 17 00:00:00 2001
From: Geoff Simmons <geoff@uplex.de>
Date: Tue, 27 Feb 2018 17:41:06 +0100
Subject: [PATCH 2/3] Fix include order for Varnish 6.0 (cache.h includes
 vrt.h).

---
 src/vmod_urlcode.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vmod_urlcode.c b/src/vmod_urlcode.c
index 69f1920..9a3acb7 100644
--- a/src/vmod_urlcode.c
+++ b/src/vmod_urlcode.c
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 
-#include "vrt.h"
 #include "cache/cache.h"
 
 #include "vcc_if.h"

From 8472c8c21d862e4352a2c313829cedc3fa54b2e5 Mon Sep 17 00:00:00 2001
From: Geoff Simmons <geoff@uplex.de>
Date: Tue, 27 Feb 2018 17:44:53 +0100
Subject: [PATCH 3/3] Adjust 'make check' so that it doesn't need sudo or
 setting PATH.

---
 src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 607085a..376ee4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,8 @@ VMOD_TESTS = tests/*.vtc
 .PHONY: $(VMOD_TESTS)
 
 tests/*.vtc:
-	@VARNISHTEST@ -Dvarnishd=@VARNISHD@ -Dvmod_topbuild=$(abs_top_builddir) $@
+	PATH=@LIBVARNISHAPI_SBINDIR@:$$PATH \
+	@VARNISHTEST@ -Dvmod_topbuild=$(abs_top_builddir) $@
 
 check: $(VMOD_TESTS)