From bc1ecea9ff369d17ff3fb2fa84a23d3e70ad530c Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Thu, 27 Aug 2009 12:01:36 +0300 Subject: 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. --- am/aggr.m4 | 2 +- bootstrap | 1 - doc/Makefile.am | 7 ++----- doc/mailfromd.texi | 5 ++++- mfd/main.c | 7 ++++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/am/aggr.m4 b/am/aggr.m4 index e23f39ec..2bdbb463 100644 --- a/am/aggr.m4 +++ b/am/aggr.m4 @@ -41,7 +41,7 @@ if (sizeof(ac_aggr.m4_bpatsubst([$1], [^[^.]*\.]))) return 0;])], [AS_VAR_SET(ac_Member, yes)], [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 ])dnl IU_CHECK_MEMBER diff --git a/bootstrap b/bootstrap index bf5909c0..46a0964e 100755 --- a/bootstrap +++ b/bootstrap @@ -507,7 +507,6 @@ slurp() { rm -f $dir/$gnulib_mk && sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk } - silentize $dir/$gnulib_mk elif { test "${2+set}" = set && test -r $2/$dir/$file; } || version_controlled_file $dir $file; then echo "$0: $dir/$file overrides $1/$dir/$file" diff --git a/doc/Makefile.am b/doc/Makefile.am index 499c2181..d1f1bd54 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,9 +62,7 @@ check-options: 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' \ $(top_srcdir)/mfd/bi_*.m4 -- \ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ @@ -72,8 +70,7 @@ check-builtins: 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' \ $(top_srcdir)/mflib/*.mf -- \ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi index e18310c8..afd85bd0 100644 --- a/doc/mailfromd.texi +++ b/doc/mailfromd.texi @@ -9246,7 +9246,10 @@ The following reply means the key was not found: 8:NOTFOUND, @end smallexample -@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?} @flindex sockmap.mf The @acronym{MFL} library provides two primitives for dealing with diff --git a/mfd/main.c b/mfd/main.c index 012625ee..3629143f 100644 --- a/mfd/main.c +++ b/mfd/main.c @@ -1141,7 +1141,7 @@ 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) { switch (key) { case 'D': @@ -1150,7 +1150,8 @@ parse_opt (int key, char *arg, struct argp_state *state) case 'U': add_pp_option("-U", arg); - + break; + case 'd': set_option("debug", arg, 1); break; @@ -1685,7 +1686,7 @@ cb_include_path(mu_debug_t err, void *data, mu_config_value_t *val) err); if (rc) break; - add_include_dir(val->v.string); + add_include_dir(pval->v.string); } mu_iterator_destroy(&itr); } -- cgit v1.2.1