[5.2] e9ff38c Make $(VMOD_LDFLAGS) available in our build too

[PÃ¥l Hermunn Johansen]

commit e9ff38c425793e4ad08c8eb4bfc3c12627b9785e
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Sep 12 00:39:05 2017 +0200

    Make $(VMOD_LDFLAGS) available in our build too
    
    Refs da91fec

diff --git a/configure.ac b/configure.ac
index 751af53..5b9dbac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,9 @@ AC_ARG_WITH([dot],
    fi])
 AM_CONDITIONAL(HAVE_DOT,[test "x$DOT" != "xno"])
 
+# Define VMOD flags
+_VARNISH_VMOD_LDFLAGS
+
 # Check for python.
 _VARNISH_CHECK_PYTHON
 
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 30a5928..b7f58e5 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -67,7 +67,7 @@ libvmod_XXX_la_CFLAGS = \\
 
 libvmod_XXX_la_LDFLAGS = \\
 	$(AM_LDFLAGS) \\
-	-module -export-dynamic -avoid-version -shared \\
+	$(VMOD_LDFLAGS) \\
 	@SAN_LDFLAGS@
 
 nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 9871b3f..3b4ed7a 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_blob_la_CFLAGS = \
 
 libvmod_blob_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_blob_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 3fb7d98..dddd350 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -27,7 +27,7 @@ libvmod_debug_la_CFLAGS = \
 
 libvmod_debug_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	-rpath /nowhere
 	@SAN_LDFLAGS@
 
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index f30062d..19e10a3 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_directors_la_CFLAGS = \
 
 libvmod_directors_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_directors_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index 9671d53..3a5b4a5 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_purge_la_CFLAGS = \
 
 libvmod_purge_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_purge_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 259476e..66410b0 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_std_la_CFLAGS = \
 
 libvmod_std_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_std_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 545bb56..1eb8f6f 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -19,7 +19,7 @@ libvmod_vtc_la_CFLAGS = \
 
 libvmod_vtc_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-module -export-dynamic -avoid-version -shared \
+	$(VMOD_LDFLAGS) \
 	@SAN_LDFLAGS@
 
 nodist_libvmod_vtc_la_SOURCES = vcc_if.c vcc_if.h
diff --git a/varnish.m4 b/varnish.m4
index 82514ea..9a7f868 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -135,12 +135,22 @@ AC_DEFUN([_VARNISH_CHECK_PYTHON], [
 
 ])
 
+# _VARNISH_VMOD_LDFLAGS
+# ---------------------
+AC_DEFUN([_VARNISH_VMOD_LDFLAGS], [
+
+	AC_SUBST([VMOD_LDFLAGS],
+		"-module -export-dynamic -avoid-version -shared")
+
+])
+
 # _VARNISH_VMOD_CONFIG
 # --------------------
 AC_DEFUN([_VARNISH_VMOD_CONFIG], [
 
 	AC_REQUIRE([_VARNISH_PKG_CONFIG])
 	AC_REQUIRE([_VARNISH_CHECK_DEVEL])
+	AC_REQUIRE([_VARNISH_VMOD_LDFLAGS])
 
 	dnl Check the VMOD toolchain
 	AC_REQUIRE([AC_LANG_C])
@@ -175,10 +185,6 @@ AC_DEFUN([_VARNISH_VMOD_CONFIG], [
 	AC_SUBST([am__v_VMODTOOL_])
 	AC_SUBST([AM_V_VMODTOOL])
 
-	dnl Define VMODs LDFLAGS
-	AC_SUBST([VMOD_LDFLAGS],
-		"-module -export-dynamic -avoid-version -shared")
-
 	dnl Substitute an alias for compatibility reasons
 	AC_SUBST([VMOD_TEST_PATH], [$VARNISH_TEST_PATH])
 ])