The syntax I gave in the --help output for --enable-masquerade incorrectly

implied that the earlier options were prerequisites for the later options
(pointed out by Scott Blachowicz).  No compact, non-confusing way to specify the
real syntax that I can see, so I'll just remove the []s and leave the explaining
about it being okay to specify a subset to the INSTALL file.

Also added a TODO item to put in proper parsing of the masquerade: line and/or
--enable-masquerade so if you misspell an option you find out about it, rather
than just having it silently fail (this weakness was currently only documented
in comments in the mts.conf-handling code).

diff --git a/INSTALL b/INSTALL
index 28ccfea2955c1cc227833c134606782020578751..c0193816100ac45d3122fa1f58611db68317954c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -162,14 +162,15 @@ Options for configure
 --enable-debug
      Enable debugging support.
 
---enable-masquerade[='draft_from[ mmailid[ username_extension]]']    
+--enable-masquerade[='draft_from mmailid username_extension']    
      If this option is not specified, the mts.conf file will contain the line
      "masquerade: " (with no value), which may be manually edited later.  You
      may find it convenient to specify a value at configure-time, however, so
      that each time nmh is reinstalled, the right value will be there.
 
-     Any subset of "draft_from mmailid username_extension" may be given.  As a
-     shortcut, simply doing `configure --enable-masquerade' will enable all 3.
+     The above usage shows all three masquerade options being specified, but any
+     subset of the three may be specified.  If you do want to enable all three,
+     you can simply use `configure --enable-masquerade' as a shortcut.
 
      See the mh-tailor(5) man page for full documentation of "masquerade:".
 

diff --git a/TODO b/TODO
index 8c9f698519f682771e6f14ead95a32c1df03558a..be9e6dd99436cc47f1f37254eff2166c150bfe5f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,6 +28,7 @@
   find what a particular option does is a pain in the nads.
 * Add some way to configure whether you prefer to see text/plain or text/html
   parts of multipart/alternative messages.
+* Flag bogus/misspelled mts.conf "masquerade:" / --enable-masquerade options.
 
 [POSSIBILITIES]
 

diff --git a/configure b/configure
index ebe1d164bcf4b9f161fe53ffab8162490a373644..42044bf6d319c41638027a64d173526dcac60945 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --enable-debug          enable nmh code debugging"
 ac_help="$ac_help
-  --enable-masquerade[='draft_from[ mmailid[ username_extension]]']
+  --enable-masquerade[='draft_from mmailid username_extension']
                           enable 3 types of email address masquerading [none]"
 ac_help="$ac_help
   --enable-mhe            enable mhe support (DEFAULT)"
@@ -1263,7 +1263,7 @@ if test -n "$RANLIB"; then
 else
   echo "$ac_t""no" 1>&6
 fi
-               for ac_prog in gawk mawk nawk awk
+               for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

diff --git a/configure.in b/configure.in
index 4bf21f9742bc5e02fc72edeac609a47cee014c83..e008945151d541254708ec99af6188e44423233a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ fi
 dnl Allow users to send email from addresses other than their default?
 undefine([masquerade])dnl
 AC_ARG_ENABLE(masquerade,
-  [  --enable-masquerade[='draft_from[ mmailid[ username_extension]]']
+  [  --enable-masquerade[='draft_from mmailid username_extension']
                           enable 3 types of email address masquerading [none]],
   [if test x"$enable_masquerade" = x"yes"; then
     masquerade="draft_from mmailid username_extension"

diff --git a/stamp-h.in b/stamp-h.in
index 5419f61a274b9e26d6505d844c73294531bb30db..84db3c44e28741b5e4332a4bc35b82afc82e0dd5 100644 (file)
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -1 +1 @@
-Mon Apr 17 05:32:06 EDT 2000
+Mon Apr 17 19:00:19 PDT 2000