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
@@ -41,7 +41,7 @@ if (sizeof(ac_aggr.m4_bpatsubst([$1], [^[^.]*\.]))) | |||
41 | return 0;])], | 41 | return 0;])], |
42 | [AS_VAR_SET(ac_Member, yes)], | 42 | [AS_VAR_SET(ac_Member, yes)], |
43 | [AS_VAR_SET(ac_Member, no)])]) | 43 | [AS_VAR_SET(ac_Member, no)])]) |
44 | AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl | 44 | AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3]) |
45 | AS_VAR_POPDEF([ac_Member])dnl | 45 | AS_VAR_POPDEF([ac_Member])dnl |
46 | ])dnl IU_CHECK_MEMBER | 46 | ])dnl IU_CHECK_MEMBER |
47 | 47 | ||
@@ -507,7 +507,6 @@ slurp() { | |||
507 | rm -f $dir/$gnulib_mk && | 507 | rm -f $dir/$gnulib_mk && |
508 | sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk | 508 | sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk |
509 | } | 509 | } |
510 | silentize $dir/$gnulib_mk | ||
511 | elif { test "${2+set}" = set && test -r $2/$dir/$file; } || | 510 | elif { test "${2+set}" = set && test -r $2/$dir/$file; } || |
512 | version_controlled_file $dir $file; then | 511 | version_controlled_file $dir $file; then |
513 | echo "$0: $dir/$file overrides $1/$dir/$file" | 512 | 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: | |||
62 | 62 | ||
63 | check-builtins: | 63 | check-builtins: |
64 | @check-docs.sh builtins \ | 64 | @check-docs.sh builtins \ |
65 | '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;\ | 65 | '/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}'\ |
66 | s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;\ | ||
67 | s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\ | ||
68 | 's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ | 66 | 's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ |
69 | $(top_srcdir)/mfd/bi_*.m4 -- \ | 67 | $(top_srcdir)/mfd/bi_*.m4 -- \ |
70 | $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ | 68 | $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ |
@@ -72,8 +70,7 @@ check-builtins: | |||
72 | 70 | ||
73 | check-mflib: | 71 | check-mflib: |
74 | @check-docs.sh "library functions" \ | 72 | @check-docs.sh "library functions" \ |
75 | '/^[ \t]*func[ \t][ \t]*__/b;\ | 73 | '/^[ \t]*func[ \t][ \t]*__/b;/^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \ |
76 | /^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \ | ||
77 | 's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ | 74 | 's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \ |
78 | $(top_srcdir)/mflib/*.mf -- \ | 75 | $(top_srcdir)/mflib/*.mf -- \ |
79 | $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ | 76 | $(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: | |||
9246 | 8:NOTFOUND, | 9246 | 8:NOTFOUND, |
9247 | @end smallexample | 9247 | @end smallexample |
9248 | 9248 | ||
9249 | @FIXME{For a detailed description of the sockmap protocol, see @uref{http://www.meta1.org}.} | 9249 | For a detailed description of the sockmap protocol, see |
9250 | @uref{http://www.meta1.org/current/doc/README.html}. | ||
9251 | |||
9252 | @FIXME{More info?} | ||
9250 | 9253 | ||
9251 | @flindex sockmap.mf | 9254 | @flindex sockmap.mf |
9252 | The @acronym{MFL} library provides two primitives for dealing with | 9255 | The @acronym{MFL} library provides two primitives for dealing with |
@@ -1141,7 +1141,7 @@ validate_options() | |||
1141 | 1141 | ||
1142 | 1142 | ||
1143 | static error_t | 1143 | static error_t |
1144 | parse_opt (int key, char *arg, struct argp_state *state) | 1144 | parse_opt(int key, char *arg, struct argp_state *state) |
1145 | { | 1145 | { |
1146 | switch (key) { | 1146 | switch (key) { |
1147 | case 'D': | 1147 | case 'D': |
@@ -1150,7 +1150,8 @@ parse_opt (int key, char *arg, struct argp_state *state) | |||
1150 | 1150 | ||
1151 | case 'U': | 1151 | case 'U': |
1152 | add_pp_option("-U", arg); | 1152 | add_pp_option("-U", arg); |
1153 | 1153 | break; | |
1154 | |||
1154 | case 'd': | 1155 | case 'd': |
1155 | set_option("debug", arg, 1); | 1156 | set_option("debug", arg, 1); |
1156 | break; | 1157 | break; |
@@ -1685,7 +1686,7 @@ cb_include_path(mu_debug_t err, void *data, mu_config_value_t *val) | |||
1685 | err); | 1686 | err); |
1686 | if (rc) | 1687 | if (rc) |
1687 | break; | 1688 | break; |
1688 | add_include_dir(val->v.string); | 1689 | add_include_dir(pval->v.string); |
1689 | } | 1690 | } |
1690 | mu_iterator_destroy(&itr); | 1691 | mu_iterator_destroy(&itr); |
1691 | } | 1692 | } |