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.])
[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...@:>@'],
CPPFLAGS="$nmh_saved_cppflags"])
if test "$nmh_cv_has_unusedmacros" = 'yes'; then
- test -z "$CPPLAGS" && CPPFLAGS=-Wunused-macros \
+ test -z "$CPPFLAGS" && CPPFLAGS=-Wunused-macros \
|| CPPFLAGS="$CPPFLAGS -Wunused-macros"
DISABLE_UNUSED_MACROS_WARNING=-Wno-unused-macros
fi
dnl Look for `cut'
pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
+AC_PATH_PROG([cutpath], [cut], [no], [$pathtmp])
+
+dnl
+dnl Check for MD5 program and formatting command
+dnl
+AC_CHECK_PROGS([MD5SUM], [md5sum md5], [missing])
+AS_CASE(["${MD5SUM}"],
+ [md5sum], [MD5FMT="cat"],
+ [md5], [[MD5FMT="${SED} -e 's/MD5 *(\(.*\)) *= \([0-9a-f]*\)/\2 \1/'"]],
+ [MD5FMT="missing"])
+AC_SUBST([MD5FMT])
dnl ----------------------------------------------
dnl check for lclint, and lint if it doesn't exist
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])
AS_CASE(["$host_os"],
[linux*],
[# Like DEFS, but doesn't get stomped on by configure when using config.h:
- test -z "$OURDEFS" && OURDEFS="-D_GNU_SOURCE" \
- || OURDEFS="$OURDEFS -D_GNU_SOURCE"])
-AC_SUBST(OURDEFS)
+ AS_IF([test -z "$CPPFLAGS"],[CPPFLAGS="-D_GNU_SOURCE"],
+ [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])])
AC_HEADER_STDC
AC_HEADER_TIOCGWINSZ
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" \
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])
compiler : ${CC}
compiler flags : ${CFLAGS}
linker flags : ${LDFLAGS}
-definitions : ${OURDEFS}
+preprocessor flags : ${CPPFLAGS}
source code location : ${srcdir}
binary install path : ${nmhbin}
library install path : ${nmhlib}
default smtp servers : ${smtpservers}
default editor : ${editorpath}
default pager : ${pagerpath}
-email address masquerading : ${masquerade}
SASL support : ${sasl_support}
TLS support : ${tls_support}
])])dnl
dnl ---------------
dnl OUTPUT MAKEFILE
dnl ---------------
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile test/common.sh])
AC_OUTPUT