X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=49221ff373d4fe840d9d07c8937bf16c08280c67;hb=02e25280094d8245772acf03396fe31c278ea337;hp=2e8cbd7a3ca21e9d071cae45b29e5a21ed416d55;hpb=8ae191f927b3e294b7a50124b8c806365c4dbeb8;p=mmh

diff --git a/configure.ac b/configure.ac
index 2e8cbd7..49221ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,16 +30,6 @@ AC_ARG_ENABLE([debug],
 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
 AS_IF([test x"$enable_nmh_debug" = x"yes"], [enable_debug=yes])
 
-dnl Allow users to send email from addresses other than their default?
-AC_ARG_ENABLE(masquerade,
-  AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'],
-    [enable up to 3 types of address masquerading]),
-  [AS_IF([test x"$enable_masquerade" = x"yes"],
-	 [masquerade="draft_from mmailid username_extension"],
-	 [masquerade="$enable_masquerade"])],
-  [masquerade="draft_from mmailid username_extension"])
-AC_SUBST(masquerade)dnl
-
 dnl Do you want to disable use of locale functions
 AH_TEMPLATE([LOCALE],
 [Undefine if you don't want locale features.  By default this is defined.])
@@ -123,16 +113,21 @@ AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"],
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 
-dnl Both the smtp and sendmail mail transport services use the smtp code
-AC_DEFINE([SMTPMTS], [1],
-  [Define if you want SMTP (simple mail transport protocol) support.])dnl
-
 dnl What should be the default pager?
 AC_ARG_WITH([pager],
   AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
 
 AS_IF([test -n "$with_pager"], [pagerpath="$with_pager"])
 
+dnl If a pager is not explicitly specified, then look for one.
+dnl Fall back to `cat', to avoid catastrophic failure of
+dnl `mhshow', et al., if pagerpath is set to `no'.
+if test -z "$pagerpath"; then
+  pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
+  AC_PATH_PROGS([pagerpath], [more less most cat], [no], [$pathtmp])
+fi
+AC_SUBST(pagerpath)dnl
+
 dnl What should be the default mail server(s)?
 AC_ARG_WITH(smtpservers,
   AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
@@ -298,17 +293,6 @@ if test "$lspath" != "no"; then
   fi])
 fi
 
-dnl Look for `more'
-pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG([morepath], [more], [no], [$pathtmp])
-
-dnl If pager is not specified yet,
-dnl then use `more' as the default.
-if test -z "$pagerpath"; then
-  pagerpath="$morepath"
-fi
-AC_SUBST(pagerpath)dnl
-
 dnl Look for `sendmail'
 pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
 AC_PATH_PROG([sendmailpath], [sendmail], [/usr/sbin/sendmail], [$pathtmp])
@@ -427,7 +411,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS([writev lstat nl_langinfo])
+AC_CHECK_FUNCS([wcwidth mbtowc writev lstat nl_langinfo])
 
 dnl Check for multibyte character set support
 if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \
@@ -445,6 +429,8 @@ AC_CHECK_FUNC([modf], , AC_CHECK_LIB([m], [modf]))
 dnl Checks for network libraries (nsl, socket)
 NMH_CHECK_NETLIBS
 
+NMH_READLINE
+
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
   AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
@@ -762,7 +748,6 @@ file locking type          : ${LOCKTYPE}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
-email address masquerading : ${masquerade}
 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}
 ])])dnl