-if test x$with_mts = xsmtp; then
- MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- AC_DEFINE(SMTPMTS)dnl
-elif test x$with_mts = xsendmail; then
- MTS="sendmail"
- MTSLIB="mts/sendmail/libsend.a"
- AC_DEFINE(SENDMTS)dnl
-else
- MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- AC_DEFINE(SMTPMTS)dnl
+dnl Do you want to debug nmh?
+undefine([debug])dnl
+AC_ARG_ENABLE(debug,
+[ --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
+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 up to 3 types of address masquerading [none]],
+ [if test x"$enable_masquerade" = x"yes"; then
+ masquerade="draft_from mmailid username_extension"
+ else
+ masquerade="$enable_masquerade"
+ fi])
+AC_SUBST(masquerade)dnl
+
+dnl Do you want mhe support?
+undefine([mhe])dnl
+AC_ARG_ENABLE(mhe,
+[ --enable-mhe enable mhe support (DEFAULT)])
+
+dnl mhe support is on by default, so define it unless --disable-mhe or the
+dnl deprecated, undocumented --disable-nmh-mhe are specified.
+if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
+ AC_DEFINE(MHE)dnl