Commit c00784ca authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

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.
parent 3333daf9
......@@ -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
......
......@@ -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@SAN_CFLAGS@
vmodtoolargs_XXX ?= --strict --boilerplate -o PFX
vmod_XXX_symbols_regex ?= Vmod_XXX_Data
libvmod_XXX_la_LDFLAGS = \\
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -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 = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment