[master] 3cb906ae0 build: Define $(vmodtool) at configure time

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Jan 7 14:16:07 UTC 2021 

commit 3cb906ae00ec14eed0a321d44fbd2a04550ac150
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jan 5 17:41:15 2021 +0100

    build: Define $(vmodtool) at configure time
    
    Incidentally, defining the variable in the boilerplate makes the
    boilerplate unusable out of tree since it assumes vmodtool is in
    $(srcdir) which is a show stopper for third party VMODs.

diff --git a/configure.ac b/configure.ac
index 2417549ac..53ba873d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,8 +679,9 @@ AC_SUBST(VARNISH_STATE_DIR)
 pkgsysconfdir='${sysconfdir}/varnish'
 AC_SUBST(pkgsysconfdir)
 
-# VMODs directory
+# VMOD variables
 AC_SUBST(vmoddir, [$\(pkglibdir\)/vmods])
+AC_SUBST(vmodtool, [$\(top_srcdir\)/lib/libvcc/vmodtool.py])
 
 # Check for linker script support
 gl_LD_VERSION_SCRIPT
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index b84f3464b..12f5ce25a 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -58,14 +58,12 @@ AM_CPPFLAGS = \\
 \t-I$(top_srcdir)/bin/varnishd \\
 \t-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_XXX ?= --strict --boilerplate -o PFX
-
 vmod_LTLIBRARIES = libvmod_XXX.la
 
 libvmod_XXX_la_CFLAGS = \\
 \t at SAN_CFLAGS@
 
+vmodtoolargs_XXX ?= --strict --boilerplate -o PFX
 vmod_XXX_symbols_regex ?= Vmod_XXX_Data
 
 libvmod_XXX_la_LDFLAGS = \\
diff --git a/lib/libvmod_blob/automake_boilerplate_blob.am b/lib/libvmod_blob/automake_boilerplate_blob.am
index 86c9a71a9..6bacd717f 100644
--- a/lib/libvmod_blob/automake_boilerplate_blob.am
+++ b/lib/libvmod_blob/automake_boilerplate_blob.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_blob ?= --strict --boilerplate -o vcc_blob_if
-
 vmod_LTLIBRARIES = libvmod_blob.la
 
 libvmod_blob_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_blob ?= --strict --boilerplate -o vcc_blob_if
 vmod_blob_symbols_regex ?= Vmod_blob_Data
 
 libvmod_blob_la_LDFLAGS = \
diff --git a/lib/libvmod_cookie/automake_boilerplate_cookie.am b/lib/libvmod_cookie/automake_boilerplate_cookie.am
index 007a19199..1129f2aea 100644
--- a/lib/libvmod_cookie/automake_boilerplate_cookie.am
+++ b/lib/libvmod_cookie/automake_boilerplate_cookie.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_cookie ?= --strict --boilerplate -o vcc_cookie_if
-
 vmod_LTLIBRARIES = libvmod_cookie.la
 
 libvmod_cookie_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_cookie ?= --strict --boilerplate -o vcc_cookie_if
 vmod_cookie_symbols_regex ?= Vmod_cookie_Data
 
 libvmod_cookie_la_LDFLAGS = \
diff --git a/lib/libvmod_debug/automake_boilerplate_debug.am b/lib/libvmod_debug/automake_boilerplate_debug.am
index e589a1c76..619ebcef4 100644
--- a/lib/libvmod_debug/automake_boilerplate_debug.am
+++ b/lib/libvmod_debug/automake_boilerplate_debug.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_debug ?= --strict --boilerplate -o vcc_debug_if
-
 vmod_LTLIBRARIES = libvmod_debug.la
 
 libvmod_debug_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_debug ?= --strict --boilerplate -o vcc_debug_if
 vmod_debug_symbols_regex ?= Vmod_debug_Data
 
 libvmod_debug_la_LDFLAGS = \
diff --git a/lib/libvmod_directors/automake_boilerplate_directors.am b/lib/libvmod_directors/automake_boilerplate_directors.am
index 2c343a523..7f52f7dca 100644
--- a/lib/libvmod_directors/automake_boilerplate_directors.am
+++ b/lib/libvmod_directors/automake_boilerplate_directors.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_directors ?= --strict --boilerplate -o vcc_directors_if
-
 vmod_LTLIBRARIES = libvmod_directors.la
 
 libvmod_directors_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_directors ?= --strict --boilerplate -o vcc_directors_if
 vmod_directors_symbols_regex ?= Vmod_directors_Data
 
 libvmod_directors_la_LDFLAGS = \
diff --git a/lib/libvmod_proxy/automake_boilerplate_proxy.am b/lib/libvmod_proxy/automake_boilerplate_proxy.am
index 066eb68dd..bd3802fd3 100644
--- a/lib/libvmod_proxy/automake_boilerplate_proxy.am
+++ b/lib/libvmod_proxy/automake_boilerplate_proxy.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_proxy ?= --strict --boilerplate -o vcc_proxy_if
-
 vmod_LTLIBRARIES = libvmod_proxy.la
 
 libvmod_proxy_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_proxy ?= --strict --boilerplate -o vcc_proxy_if
 vmod_proxy_symbols_regex ?= Vmod_proxy_Data
 
 libvmod_proxy_la_LDFLAGS = \
diff --git a/lib/libvmod_purge/automake_boilerplate_purge.am b/lib/libvmod_purge/automake_boilerplate_purge.am
index 89aeabb4a..e3ec8bf65 100644
--- a/lib/libvmod_purge/automake_boilerplate_purge.am
+++ b/lib/libvmod_purge/automake_boilerplate_purge.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_purge ?= --strict --boilerplate -o vcc_purge_if
-
 vmod_LTLIBRARIES = libvmod_purge.la
 
 libvmod_purge_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_purge ?= --strict --boilerplate -o vcc_purge_if
 vmod_purge_symbols_regex ?= Vmod_purge_Data
 
 libvmod_purge_la_LDFLAGS = \
diff --git a/lib/libvmod_std/automake_boilerplate_std.am b/lib/libvmod_std/automake_boilerplate_std.am
index 57dec41a3..f52815531 100644
--- a/lib/libvmod_std/automake_boilerplate_std.am
+++ b/lib/libvmod_std/automake_boilerplate_std.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_std ?= --strict --boilerplate -o vcc_std_if
-
 vmod_LTLIBRARIES = libvmod_std.la
 
 libvmod_std_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_std ?= --strict --boilerplate -o vcc_std_if
 vmod_std_symbols_regex ?= Vmod_std_Data
 
 libvmod_std_la_LDFLAGS = \
diff --git a/lib/libvmod_unix/automake_boilerplate_unix.am b/lib/libvmod_unix/automake_boilerplate_unix.am
index 02cd56b2a..e0b5eca25 100644
--- a/lib/libvmod_unix/automake_boilerplate_unix.am
+++ b/lib/libvmod_unix/automake_boilerplate_unix.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_unix ?= --strict --boilerplate -o vcc_unix_if
-
 vmod_LTLIBRARIES = libvmod_unix.la
 
 libvmod_unix_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_unix ?= --strict --boilerplate -o vcc_unix_if
 vmod_unix_symbols_regex ?= Vmod_unix_Data
 
 libvmod_unix_la_LDFLAGS = \
diff --git a/lib/libvmod_vtc/automake_boilerplate_vtc.am b/lib/libvmod_vtc/automake_boilerplate_vtc.am
index 620fd9430..7b883cb02 100644
--- a/lib/libvmod_vtc/automake_boilerplate_vtc.am
+++ b/lib/libvmod_vtc/automake_boilerplate_vtc.am
@@ -7,14 +7,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs_vtc ?= --strict --boilerplate -o vcc_vtc_if
-
 vmod_LTLIBRARIES = libvmod_vtc.la
 
 libvmod_vtc_la_CFLAGS = \
 	@SAN_CFLAGS@
 
+vmodtoolargs_vtc ?= --strict --boilerplate -o vcc_vtc_if
 vmod_vtc_symbols_regex ?= Vmod_vtc_Data
 
 libvmod_vtc_la_LDFLAGS = \

More information about the varnish-commit mailing list