Also make sure outc() uses TPUTS_PUTC_ARG.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 00835424153541dd4f645351f97b5535eb718b5d..8db3acf2596f6a80f5f1ed80df7cc68d3cb09d12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -328,14 +328,14 @@ dnl ---------------------------------------------
 dnl CHECK FOR PROGRAM TO PROVIDE MIME TYPE STRING
 dnl ---------------------------------------------
 AS_IF([file --mime "${srcdir}"/configure >/dev/null 2>&1],
-      [nmh_mimetypeproc='"file --mime"'])
-if test -n "$nmh_mimetypeproc"; then
-  AS_IF([file --brief --mime "${srcdir}"/configure >/dev/null 2>&1],
-      [nmh_mimetypeproc='"file --brief --mime"'])
-fi
+      [AS_IF([file --brief --mime "${srcdir}"/configure >/dev/null 2>&1],
+             [nmh_mimetypeproc='"file --brief --mime"'],
+             [nmh_mimetypeproc='"file --mime"'])])
 AS_CASE([$nmh_mimetypeproc], [?*],
         [AC_DEFINE_UNQUOTED([MIMETYPEPROC], [$nmh_mimetypeproc],
           [Program, with arguments, that provides MIME type string.])])
+AS_ECHO_N(["AS_ESCAPE([checking program to provide MIME type string ... ])"])
+AS_ECHO(["AS_ESCAPE([$nmh_mimetypeproc], [""])"])
 
 dnl ------------------
 dnl CHECK HEADER FILES
@@ -358,8 +358,8 @@ AS_CASE(["$host_os"],
                 [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])])
 
 AC_HEADER_TIOCGWINSZ
-AC_CHECK_HEADERS([fcntl.h ncurses/termcap.h termcap.h langinfo.h \
-                  wchar.h wctype.h sys/param.h sys/time.h sys/stream.h])
+AC_CHECK_HEADERS([fcntl.h langinfo.h wchar.h wctype.h sys/param.h \
+                 sys/time.h sys/stream.h])
 
 AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
   [Define to 1 if `struct winsize' requires <sys/ptem.h>.]),,
@@ -402,13 +402,16 @@ NMH_LOCKING
 dnl Check for iconv
 NMH_CHECK_ICONV
 
+dnl Check for tputs() callback argument
+NMH_TPUTS_PUTC_ARG
+
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
-  AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
+  AC_CHECK_LIB([${lib}], [setupterm], [TERMLIB="-l$lib"; break])
 done
 AC_SUBST([TERMLIB])dnl
 AS_IF([test "x$TERMLIB" = "x"],
-      [AC_MSG_FAILURE([Could not find tgetent in any library.  Is there a curses
+      [AC_MSG_FAILURE([Could not find setupterm in any library.  Is there a curses
 or ncurses library or package that you can install?])])
 
 dnl --------------
@@ -598,9 +601,11 @@ dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
                [flex\ 2.5.35], [LFLAGS=\
-'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@'],
+'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@; \
+true'],
                [flex\ 2.5.36], [LFLAGS=\
-'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@'])
+'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@; \
+true'])
        AC_SUBST([LFLAGS])])
 
 dnl --------------