[master] 6fde72c63 param: Give string parameters canned defaults

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Jan 3 14:13:06 UTC 2022


commit 6fde72c63c568e7551d36d38d81f31f8feb56d23
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Sep 9 07:50:36 2021 +0200

    param: Give string parameters canned defaults
    
    This way the documentation can show neutral defaults for parameters that
    are highly platform-dependent.

diff --git a/include/tbl/params.h b/include/tbl/params.h
index 8b82b97f1..20929d823 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1535,7 +1535,10 @@ PARAM_STRING(
 	"the string will be replaced with the source file name, "
 	"%o will be replaced with the output file name, and %w "
 	"will be replaced by the cc_warnings parameter.",
-	/* flags */	MUST_RELOAD
+	/* flags */	MUST_RELOAD | BUILD_OPTIONS,
+	/* dyn_min_reason */	NULL,
+	/* dyn_max_reason */	NULL,
+	/* dyn_def_reason */	"exec $CC $CFLAGS %w -shared -o %o %s"
 )
 
 PARAM_STRING(
@@ -1547,7 +1550,10 @@ PARAM_STRING(
 	"Warnings used when compiling the C source code with "
 	"the cc_command parameter. By default, VCL is compiled "
 	"with the same set of warnings as Varnish itself.",
-	/* flags */	MUST_RELOAD
+	/* flags */	MUST_RELOAD | BUILD_OPTIONS,
+	/* dyn_min_reason */	NULL,
+	/* dyn_max_reason */	NULL,
+	/* dyn_def_reason */	"-Wall -Werror"
 )
 
 PARAM_STRING(
@@ -1573,7 +1579,11 @@ PARAM_STRING(
 	"VCL files in both the system configuration and shared "
 	"data directories to allow packages to drop their VCL "
 	"files in a standard location where relative includes "
-	"would work."
+	"would work.",
+	/* flags */	BUILD_OPTIONS,
+	/* dyn_min_reason */	NULL,
+	/* dyn_max_reason */	NULL,
+	/* dyn_def_reason */	"${sysconfdir}/varnish:${datadir}/varnish/vcl"
 )
 
 PARAM_STRING(
@@ -1583,7 +1593,11 @@ PARAM_STRING(
 	/* def */	VARNISH_VMOD_DIR,
 	/* descr */
 	"Directory (or colon separated list of directories) "
-	"where VMODs are to be found."
+	"where VMODs are to be found.",
+	/* flags */	BUILD_OPTIONS,
+	/* dyn_min_reason */	NULL,
+	/* dyn_max_reason */	NULL,
+	/* dyn_def_reason */	"${libdir}/varnish/vmods"
 )
 
 /*--------------------------------------------------------------------


More information about the varnish-commit mailing list