X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3c0c7703cd4267119943391e31aa3b7e9d708fa7..c30f86b9629d62eaf9e6617e3303cdc7323026a6:/configure.ac

diff --git a/configure.ac b/configure.ac
index 4f7229a3..ed4b6b15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ if test -n "$auto_cflags"; then
                  CFLAGS="$nmh_saved_cflags"])
   test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
 
+  dnl for Ubuntu
   AC_CACHE_CHECK([whether compiler supports -Wno-unused-result],
                  [nmh_cv_has_wnur],
                  [nmh_saved_cflags="$CFLAGS"
@@ -160,22 +161,24 @@ dnl --------------
 if test `uname` = OpenBSD; then
   dnl Filter out "often/almost always misused" warnings from OpenBSD linker.
   [POSTLINK="2>&1 | egrep -v ': [w]arning: s[a-z]+\(\) is \
-(almost always|often) misused, please use'; true"]
+(almost always|often) misused, please use' || true"]
 fi
 AC_SUBST([POSTLINK])
 
 dnl -----------------
 dnl CUSTOMIZE LDFLAGS
 dnl -----------------
-AS_IF([test "$GCC" = yes  &&  `${CC} --version 2>&1 | grep clang >/dev/null`],
-  dnl Disable clang complaint about unused -ansi when linking.
-  [AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
-                  [nmh_cv_has_q_unused_arguments],
-                  [nmh_saved_ldflags="$LDFLAGS"
-                   LDFLAGS="$LDFLAGS -Qunused-arguments"
-                   AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
-                                     nmh_cv_has_q_unused_arguments=no)
-                   LDFLAGS="$nmh_saved_ldflags"])])
+dnl Disable clang complaint about unused -ansi when linking.
+AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
+               [nmh_cv_has_q_unused_arguments],
+               [AS_IF([test "$GCC" = yes  &&  `${CC} --version 2>&1 | \
+                       grep clang >/dev/null`],
+                      [nmh_saved_ldflags="$LDFLAGS"
+                       LDFLAGS="$LDFLAGS -Qunused-arguments"
+                       AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
+                                         nmh_cv_has_q_unused_arguments=no)
+                       LDFLAGS="$nmh_saved_ldflags"],
+                       [nmh_cv_has_q_unused_arguments=no])])
 test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
   LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"
 
@@ -304,18 +307,7 @@ AC_CACHE_CHECK(what group owns the mail spool, nmh_cv_ls_mail_grp,
 MAIL_SPOOL_GRP=$nmh_cv_ls_mail_grp
 AC_SUBST([MAIL_SPOOL_GRP])dnl
 
-dnl ---------------------------------------------
-dnl CHECK FOR PROGRAM TO PROVIDE MIME TYPE STRING
-dnl ---------------------------------------------
-AS_IF([file --mime "${srcdir}"/configure >/dev/null 2>&1],
-      [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], [""])"])
+NMH_MIMETYPEPROC
 
 dnl ------------------
 dnl CHECK HEADER FILES