If parse_mime() fails and the -file switch was used, pass the input

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 093655637e3b67aad1718f21818241925e9db976..a2f0c5ed6f43c761ed94e93e12bfb73545c1c141 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,9 +84,6 @@ AC_PREFIX_PROGRAM([mhparam])
 dnl ------------------
 dnl CHECK THE COMPILER
 dnl ------------------
-dnl We want these before the checks,
-dnl so the checks can modify their values.
-test -z "$CFLAGS"  &&  auto_cflags=1
 
 AC_PROG_CC([cc gcc])
 AM_PROG_CC_C_O
@@ -94,51 +91,32 @@ AM_PROG_CC_C_O
 dnl ----------------
 dnl CUSTOMIZE CFLAGS
 dnl ----------------
-if test -n "$auto_cflags"; then
-  dnl The user didn't specify CFLAGS, so customize them.
-  if test "$GCC" = yes; then
-    dnl Can't use -ansi with gcc 4.5.3 on Cygwin, at least through setup
-    dnl version 2.763, because it disables some features in the system
-    dnl header files and warns about them with -Wall.  Try to test for
-    dnl that generally, with gcc.
-    AC_CACHE_CHECK([whether we can use -ansi with gcc], [nmh_cv_has_dash_ansi],
-      [nmh_saved_cppflags="$CPPFLAGS"
-       nmh_saved_cflags="$CFLAGS"
-       CPPFLAGS="-D_GNU_SOURCE"
-       CFLAGS="-ansi -Wall -Werror"
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <time.h>],[tzset();])],
-         [nmh_cv_has_dash_ansi=yes],
-         [nmh_cv_has_dash_ansi=no])
-       CPPFLAGS="$nmh_saved_cppflags"
-       CFLAGS="$nmh_saved_cflags"])
-    test "$nmh_cv_has_dash_ansi" = "yes"  &&  \
-      CFLAGS="${CFLAGS:+$CFLAGS }-ansi -pedantic"
-  else
-    dnl Use -v and some other options with SunStudio cc.  lex produces
-    dnl code that causes unreachable-statement warnings.  It might be
-    dnl better to use an autoconf test, except -v will probably succeed
-    dnl with many other compilers but have different meaning.
-    AS_CASE([`${CC} -V 2>&1`],
-            [cc:\ Sun\ C*], [CFLAGS=\
+dnl The user didn't specify CFLAGS, so customize them.
+if test "$GCC" != yes; then
+  dnl Use -v and some other options with SunStudio cc.  lex produces
+  dnl code that causes unreachable-statement warnings.  It might be
+  dnl better to use an autoconf test, except -v will probably succeed
+  dnl with many other compilers but have different meaning.
+  AS_CASE([`${CC} -V 2>&1`],
+          [cc:\ Sun\ C*], [CFLAGS=\
 "${CFLAGS:+$CFLAGS }-v -errtags=yes -erroff=E_STATEMENT_NOT_REACHED"])
-  fi
-
-  AC_CACHE_CHECK([whether compiler supports -Wall], [nmh_cv_has_wall],
-                 [nmh_saved_cflags="$CFLAGS"
-                 CFLAGS="$CFLAGS -Wall -Werror"
-                 AC_TRY_COMPILE([],[],nmh_cv_has_wall=yes,nmh_cv_has_wall=no)
-                 CFLAGS="$nmh_saved_cflags"])
-  test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
-
-  AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
-                 [nmh_saved_cflags="$CFLAGS"
-                 CFLAGS="$CFLAGS -Wextra -Werror"
-                 AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,
-                                nmh_cv_has_wextra=no)
-                 CFLAGS="$nmh_saved_cflags"])
-  test "$nmh_cv_has_wextra" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wextra"
 fi
 
+AC_CACHE_CHECK([whether compiler supports -Wall], [nmh_cv_has_wall],
+               [nmh_saved_cflags="$CFLAGS"
+               CFLAGS="$CFLAGS -Wall -Werror"
+               AC_TRY_COMPILE([],[],nmh_cv_has_wall=yes,nmh_cv_has_wall=no)
+               CFLAGS="$nmh_saved_cflags"])
+test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
+
+AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
+               [nmh_saved_cflags="$CFLAGS"
+               CFLAGS="$CFLAGS -Wextra -Werror"
+               AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,
+                              nmh_cv_has_wextra=no)
+               CFLAGS="$nmh_saved_cflags"])
+test "$nmh_cv_has_wextra" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wextra"
+
 if test "$GCC" = yes; then
   dnl Do this regardless of auto_cflags value.
   dnl Enable _FORTIFY_SOURCE checking, which is supported by
@@ -572,9 +550,10 @@ dnl We only use the expanded versions to print the install paths in
 dnl the final summary and should use them nowhere else (see the autoconf
 dnl docs for the rationale for bindir etc being unexpanded).
 eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
+eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
+eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";
 
 AC_MSG_NOTICE([
@@ -591,6 +570,7 @@ binary install path        : ${nmhbin}
 libexec install path       : ${nmhlibexec}/nmh
 config files install path  : ${nmhsysconf}/nmh
 man page install path      : ${nmhman}
+docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}