X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=49221ff373d4fe840d9d07c8937bf16c08280c67;hb=3bebe0e894828d80183926d4fc19fc01cd3c274e;hp=480c8bec605404d84035d83f26dea2128cc83eae;hpb=3a85e0bc9c72935ca9d154b3aa3093c31ed1836e;p=mmh diff --git a/configure.ac b/configure.ac index 480c8be..49221ff 100644 --- a/configure.ac +++ b/configure.ac @@ -113,14 +113,21 @@ AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"], [MTS="smtp"]) AC_SUBST([MTS])dnl -NMH_READLINE - 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...@:>@'], @@ -286,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]) @@ -433,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])