use AS_HELP_STRING for formatting help messages

diff --git a/ChangeLog b/ChangeLog
index 56fb2f5..7f5be11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-18  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 2006-01-18  Oliver Kiddle  <okiddle@yahoo.co.uk>
 

+       * configure.in: use AS_HELP_STRING for formatting help messages
+

        * configure.in, sbr/fmt_scan.c: add autoconf magic to support
        old systems that don't support multibyte character sets
 
        * configure.in, sbr/fmt_scan.c: add autoconf magic to support
        old systems that don't support multibyte character sets
 

diff --git a/configure.in b/configure.in
index 525ba8c..59d9207 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,8 @@ dnl
 dnl $Id$
 dnl
 
 dnl $Id$
 dnl
 

-dnl 2.13 definitely chokes; 2.53 is the earliest version I've tested. 
+dnl 2.13 definitely chokes; 2.53 is the earliest version I've tested.
+dnl 2.58 needed for help string macro but that only affects help output

 dnl 2.50 is the major breakpoint between the old autoconf and the new,
 dnl so require that. If there are bug reports about 2.50-2.52 not working
 dnl we can always move this up a little.
 dnl 2.50 is the major breakpoint between the old autoconf and the new,
 dnl so require that. If there are bug reports about 2.50-2.52 not working
 dnl we can always move this up a little.


@@ -43,8 +44,8 @@ dnl CHECK COMMAND LINE OPTIONS
 dnl --------------------------
 
 dnl Do you want client-side support for apop?
 dnl --------------------------
 
 dnl Do you want client-side support for apop?

-AC_ARG_ENABLE(apop,
-[  --enable-apop           enable client-side support for POP3 and APOP])
+AC_ARG_ENABLE(apop, AS_HELP_STRING([--enable-apop],
+  [enable client-side support for POP3 and APOP]))

 if test x"$enable_apop" = x"yes"; then
   AC_DEFINE(APOP)dnl
   APOPLIB=md5.o
 if test x"$enable_apop" = x"yes"; then
   AC_DEFINE(APOP)dnl
   APOPLIB=md5.o


@@ -54,7 +55,7 @@ AC_SUBST(APOPLIB)dnl
 
 dnl Do you want to debug nmh?
 AC_ARG_ENABLE(debug,
 
 dnl Do you want to debug nmh?
 AC_ARG_ENABLE(debug,

-[  --enable-debug          enable nmh code debugging])
+  AS_HELP_STRING([--enable-debug],[enable nmh code debugging]))

 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
 if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
 if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes


@@ -62,8 +63,8 @@ fi
 
 dnl Allow users to send email from addresses other than their default?
 AC_ARG_ENABLE(masquerade,
 
 dnl Allow users to send email from addresses other than their default?
 AC_ARG_ENABLE(masquerade,

-  [  --enable-masquerade[='draft_from mmailid username_extension']
-                          enable up to 3 types of address masquerading [none]],
+  AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'],
+    [enable up to 3 types of address masquerading]),

   [if test x"$enable_masquerade" = x"yes"; then
     masquerade="draft_from mmailid username_extension"
   else
   [if test x"$enable_masquerade" = x"yes"; then
     masquerade="draft_from mmailid username_extension"
   else


@@ -73,7 +74,7 @@ AC_SUBST(masquerade)dnl
 
 dnl Do you want mhe support?
 AC_ARG_ENABLE(mhe,
 
 dnl Do you want mhe support?
 AC_ARG_ENABLE(mhe,

-[  --enable-mhe            enable mhe support (DEFAULT)])
+  AS_HELP_STRING([--disable-mhe],[disable mhe support]))

 
 dnl mhe support is on by default, so define it unless --disable-mhe or the
 dnl deprecated, undocumented --disable-nmh-mhe are specified.
 
 dnl mhe support is on by default, so define it unless --disable-mhe or the
 dnl deprecated, undocumented --disable-nmh-mhe are specified.


@@ -83,7 +84,7 @@ fi
 
 dnl Do you want client-side support for pop?
 AC_ARG_ENABLE(pop,
 
 dnl Do you want client-side support for pop?
 AC_ARG_ENABLE(pop,

-[  --enable-pop            enable client-side support for plain POP3])
+  AS_HELP_STRING([--enable-pop], [enable client-side support for plain POP3]))

 dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
 if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes
 dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
 if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes


@@ -91,8 +92,8 @@ fi
 
 dnl Do you want client-side support for using SASL for authentication?
 dnl Note that this code will be enabled for both POP and SMTP
 
 dnl Do you want client-side support for using SASL for authentication?
 dnl Note that this code will be enabled for both POP and SMTP

-AC_ARG_WITH(cyrus-sasl,
-[  --with-cyrus-sasl=<dir> Specify location of Cyrus SASL library for auth])
+AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl=DIR],
+  [specify location of Cyrus SASL library]))

 if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL)dnl
   sasl_support=yes
 if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL)dnl
   sasl_support=yes


@@ -102,7 +103,7 @@ fi
 
 dnl What should be the default editor?
 AC_ARG_WITH(editor,
 
 dnl What should be the default editor?
 AC_ARG_WITH(editor,

-[  --with-editor=EDITOR    specify the default editor])
+  AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))

 
 if test -n "$with_editor"; then
   editorpath="$with_editor"
 
 if test -n "$with_editor"; then
   editorpath="$with_editor"


@@ -110,7 +111,7 @@ fi
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],

-  [  --with-hash-backup      use # as the backup prefix (default: ,)])
+  AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)]))

 if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
   backup_prefix="#"
 else
 if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
   backup_prefix="#"
 else


@@ -120,14 +121,14 @@ AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix")dnl
 
 dnl Do you want support for hesiod
 AC_ARG_WITH(hesiod,
 
 dnl Do you want support for hesiod
 AC_ARG_WITH(hesiod,

-[  --with-hesiod=PREFIX    specify location of Hesiod])
+  AS_HELP_STRING([--with-hesiod=DIR],[specify location of Hesiod]))

 if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
   AC_DEFINE(HESIOD)dnl
 fi
 
 dnl Do you want client-side support for kpop
 if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
   AC_DEFINE(HESIOD)dnl
 fi
 
 dnl Do you want client-side support for kpop

-AC_ARG_WITH(krb4,
-[  --with-krb4=PREFIX      specify location of Kerberos V4 for KPOP support])
+AC_ARG_WITH(krb4, AS_HELP_STRING([--with-krb4=DIR],
+  [specify location of Kerberos V4 for KPOP support]))

 if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
   enable_pop=yes
   AC_DEFINE(KPOP)dnl
 if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
   enable_pop=yes
   AC_DEFINE(KPOP)dnl


@@ -147,8 +148,8 @@ AC_SUBST(POPSED)dnl
 
 dnl What method of locking to use?
 AC_ARG_WITH(locking,
 
 dnl What method of locking to use?
 AC_ARG_WITH(locking,

-[  --with-locking=LOCKTYPE specify the file locking method
-                          (one of dot, fcntl, flock, lockf)])
+  AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
+  [specify the file locking method]))

 
 if test x"$with_locking" = x"dot"; then
   LOCKTYPE="dot"
 
 if test x"$with_locking" = x"dot"; then
   LOCKTYPE="dot"


@@ -169,7 +170,8 @@ fi
 
 dnl What method of posting should post use?
 AC_ARG_WITH(mts,
 
 dnl What method of posting should post use?
 AC_ARG_WITH(mts,

-[  --with-mts=MTS          specify the default mail transport agent/service])
+  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
+  [specify the default mail transport agent/service]))

 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"


@@ -185,7 +187,7 @@ AC_DEFINE(SMTPMTS)dnl
 
 dnl What should be the default pager?
 AC_ARG_WITH(pager,
 
 dnl What should be the default pager?
 AC_ARG_WITH(pager,

-[  --with-pager=PAGER      specify the default pager])
+  AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))

 
 if test -n "$with_pager"; then
   pagerpath="$with_pager"
 
 if test -n "$with_pager"; then
   pagerpath="$with_pager"


@@ -193,8 +195,8 @@ fi
 
 dnl What should be the default mail server(s)?
 AC_ARG_WITH(smtpservers,
 
 dnl What should be the default mail server(s)?
 AC_ARG_WITH(smtpservers,

-[  --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
-                          specify the default SMTP server(s) [localhost]])
+  AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
+  [specify the default SMTP server(s) @<:@localhost@:>@]))

 if test -n "$with_smtpservers"; then
   smtpservers="$with_smtpservers"
 else
 if test -n "$with_smtpservers"; then
   smtpservers="$with_smtpservers"
 else