diff options
-rw-r--r-- | NEWS | 11 | ||||
-rw-r--r-- | doc/pies.texi | 12 | ||||
-rw-r--r-- | src/cmdline.opt | 3 | ||||
-rw-r--r-- | src/piesctl-cl.opt | 14 | ||||
-rw-r--r-- | src/piesctl.c | 3 |
5 files changed, 38 insertions, 5 deletions
@@ -1,4 +1,4 @@ -GNU Pies NEWS -- history of user-visible changes. 2021-02-03 +GNU Pies NEWS -- history of user-visible changes. 2021-02-12 See the end of file for copying conditions. Please send Pies bug reports to <bug-pies@gnu.org> or @@ -12,6 +12,15 @@ Two command line options are provided to select the preprocessor to use instead of the default m4. The --preprocessor=COMMAND option instructs pies to use COMMAND as preprocessor. The --no-preprocessor option disables the use of the external preprocessor. + +The new command line options are available both in pies and in the +client program piesctl. + +* piesctl: fix order in which configuration files are examined + +As stated in the documentation, program-specific configuration +file piesctl.conf takes precedence over pies.conf. + Version 1.5, 2020-12-14 diff --git a/doc/pies.texi b/doc/pies.texi index d5b39ca..747c7ea 100644 --- a/doc/pies.texi +++ b/doc/pies.texi @@ -3357,13 +3357,21 @@ for a description of allowed URL forms. Enable verbose diagnostics. @end table -Before parsing, configuration file is preprocessed using -@command{m4}. The following options control this feature: +Before parsing, configuration file is preprocessed using external +command defined at buid time (normally @command{m4}). The following +options control this feature: @table @option @item -E Show preprocessed configuration on stdout and exit. +@item --no-preprocessor +Disable the use of the external preprocessor. + +@item --preprocessor=@var{cmd} +Use the command @var{cmd} as the external preprocessor, instead of the +default @command{m4}. + @item --define=@var{sym}[=@var{value}] @itemx -D @var{symbol}[=@var{value}] Define symbol @var{sym} as having @var{value}, or empty, if diff --git a/src/cmdline.opt b/src/cmdline.opt index 95ede4c..83c8819 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -132,7 +132,8 @@ GROUP(Preprocessor) OPTION(preprocessor,,COMMAND, [<use COMMAND instead of the default preprocessor>]) BEGIN - grecs_preprocessor = optarg; + if (DEFAULT_PREPROCESSOR) + grecs_preprocessor = optarg; END OPTION(no-preprocessor,,, diff --git a/src/piesctl-cl.opt b/src/piesctl-cl.opt index ea71d59..8a72703 100644 --- a/src/piesctl-cl.opt +++ b/src/piesctl-cl.opt @@ -77,6 +77,19 @@ END GROUP(Preprocessor) +OPTION(preprocessor,,COMMAND, + [<use COMMAND instead of the default preprocessor>]) +BEGIN + if (DEFAULT_PREPROCESSOR) + grecs_preprocessor = optarg; +END + +OPTION(no-preprocessor,,, + [<disable preprocessing>]) +BEGIN + grecs_preprocessor = NULL; +END + OPTION(include-directory,I,DIR, [<add include directory>]) BEGIN @@ -95,6 +108,7 @@ BEGIN pp_add_option ("-U", optarg); END + OPTIONS_END void diff --git a/src/piesctl.c b/src/piesctl.c index 44b3d0f..d88c441 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -168,7 +168,7 @@ parse_config (void) program_name, file_name); } - if (!client.url) + if (!client.url && !default_url) { /* Try local instance configuration */ file_name = mkfilename (SYSCONFDIR, instance, ".conf"); @@ -2322,6 +2322,7 @@ main (int argc, char **argv) textdomain (PACKAGE); #endif grecs_print_diag_fun = piesctl_diag; + grecs_preprocessor = DEFAULT_PREPROCESSOR; proginfo.print_help_hook = command_help; parse_options (argc, argv, &i); |