X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c4bbc2137e04f0be80fa008b97d65656e3e11ec5..e96b045f0c9576f118c340fc533bb3cff396117d:/configure.ac

diff --git a/configure.ac b/configure.ac
index 24bac7fd..6d140bc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,10 +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"'])
+      [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
@@ -589,14 +593,16 @@ dnl ----------------
 dnl CHECK FLEX FIXUP
 dnl ----------------
 dnl Use LFLAGS make variable setting to work around bugs in flex
-dnl 2.5.35-37 that cause signed/unsigned mismatch,
+dnl 2.5.36 that cause signed/unsigned mismatch,
 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 $@'],
-               [flex\ 2.5.3@<:@67@:>@], [LFLAGS=\
-'; printf "%s\n" '\''1,$$s/\(	\)int i;/\1yy_size_t i;/'\'' 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 $@; \
+true'])
        AC_SUBST([LFLAGS])])
 
 dnl --------------