diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-27 12:01:36 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-27 13:10:22 +0300 |
commit | bc1ecea9ff369d17ff3fb2fa84a23d3e70ad530c (patch) | |
tree | b2ffddd9065b73342fda75565de63083f96701d1 | |
parent | 4ceb28836e5231c79da5a936cfe2f5416c9b05e0 (diff) | |
download | mailfromd-bc1ecea9ff369d17ff3fb2fa84a23d3e70ad530c.tar.gz mailfromd-bc1ecea9ff369d17ff3fb2fa84a23d3e70ad530c.tar.bz2 |
Minor fixes.
* mfd/main.c (parse_opt): Add missing break.
(cb_include_path): Fix use of improper variable
in MU_CFG_LIST branch.
* am/aggr.m4 (IU_CHECK_MEMBER): Remove improper use of dnl.
* doc/Makefile.am (check-builtins, check-mflib): Do not
split sed expressions over multiple lines: Makefile format
cannot handle it properly.
* doc/mailfromd.texi: Update.
* bootstrap: Do not apply `silentize' to gnu/gnulib.mk. Latest
gnulib takes care of it itself.
-rw-r--r-- | am/aggr.m4 | 2 | ||||
-rwxr-xr-x | bootstrap | 1 | ||||
-rw-r--r-- | doc/Makefile.am | 7 | ||||
-rw-r--r-- | doc/mailfromd.texi | 5 | ||||
-rw-r--r-- | mfd/main.c | 7 |
5 files changed, 11 insertions, 11 deletions
@@ -43,3 +43,3 @@ return 0;])], [AS_VAR_SET(ac_Member, no)])]) -AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl +AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3]) AS_VAR_POPDEF([ac_Member])dnl @@ -509,3 +509,2 @@ slurp() { } - silentize $dir/$gnulib_mk elif { test "${2+set}" = set && test -r $2/$dir/$file; } || diff --git a/doc/Makefile.am b/doc/Makefile.am index 499c2181..d1f1bd54 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -64,5 +64,3 @@ check-builtins: @check-docs.sh builtins \ - '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;\ - s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;\ - s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\ + '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\ 's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ @@ -74,4 +72,3 @@ check-mflib: @check-docs.sh "library functions" \ - '/^[ \t]*func[ \t][ \t]*__/b;\ - /^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \ + '/^[ \t]*func[ \t][ \t]*__/b;/^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \ 's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi index e18310c8..afd85bd0 100644 --- a/doc/mailfromd.texi +++ b/doc/mailfromd.texi @@ -9248,3 +9248,6 @@ The following reply means the key was not found: -@FIXME{For a detailed description of the sockmap protocol, see @uref{http://www.meta1.org}.} +For a detailed description of the sockmap protocol, see +@uref{http://www.meta1.org/current/doc/README.html}. + +@FIXME{More info?} @@ -1143,3 +1143,3 @@ validate_options() static error_t -parse_opt (int key, char *arg, struct argp_state *state) +parse_opt(int key, char *arg, struct argp_state *state) { @@ -1152,3 +1152,4 @@ parse_opt (int key, char *arg, struct argp_state *state) add_pp_option("-U", arg); - + break; + case 'd': @@ -1687,3 +1688,3 @@ cb_include_path(mu_debug_t err, void *data, mu_config_value_t *val) break; - add_include_dir(val->v.string); + add_include_dir(pval->v.string); } |