docs/FAQ: Replace suggestion of NOMHNPROC with -nocheckmime.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7778d2f3a3f267992d7ef914cd6f975532d26857..d1a755ca61aebaba69d84bfb269c0d252b40d3ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,13 @@ AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"],
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 

-dnl What should be the default mail server(s)?
-AC_ARG_WITH([smtpservers],
-  [AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
-  [specify the default SMTP server(s) @<:@localhost@:>@])])
-AS_IF([test -n "$with_smtpservers"], [smtpservers="$with_smtpservers"],
-      [smtpservers="localhost"])
-AC_SUBST([smtpservers])dnl
+dnl What should be the default mail server?
+AC_ARG_WITH([smtpserver],
+  [AS_HELP_STRING([--with-smtpserver='SMTPSERVER'],
+  [specify the default SMTP server @<:@localhost@:>@])])
+AS_IF([test -n "$with_smtpserver"], [smtpserver="$with_smtpserver"],
+      [smtpserver="localhost"])
+AC_SUBST([smtpserver])dnl

 
 dnl -------------------------------------------------------------------
 dnl Default location is /usr/local/nmh/{bin,etc,libexec,man}, unless we
 
 dnl -------------------------------------------------------------------
 dnl Default location is /usr/local/nmh/{bin,etc,libexec,man}, unless we


@@ -212,6 +212,7 @@ AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
                        [nmh_cv_has_q_unused_arguments=no])])
 test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
   AM_LDFLAGS="${AM_LDFLAGS:+$AM_LDFLAGS }-Qunused-arguments"
                        [nmh_cv_has_q_unused_arguments=no])])
 test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
   AM_LDFLAGS="${AM_LDFLAGS:+$AM_LDFLAGS }-Qunused-arguments"

+AC_SUBST([AM_LDFLAGS])

 
 dnl This hack turns off assertions by default, assuming
 dnl that configure still uses this shell variable.  Without
 
 dnl This hack turns off assertions by default, assuming
 dnl that configure still uses this shell variable.  Without


@@ -463,8 +464,8 @@ dnl -----------------
 dnl Enable SASL?
 dnl -----------------
 dnl By default (with_cyrus_sasl=''), enable SASL if header and lib are found.
 dnl Enable SASL?
 dnl -----------------
 dnl By default (with_cyrus_sasl=''), enable SASL if header and lib are found.

-dnl If SASL requested (--with-sasl with_cyrus_sasl=yes), error if header or lib not found.
-dnl If SASL disabled (--without-sasl with_cyrus_sasl=no), don't enable it.
+dnl If SASL requested (--with-cyrus-sasl with_cyrus_sasl=yes), error if header or lib not found.
+dnl If SASL disabled (--without-cyrus-sasl with_cyrus_sasl=no), don't enable it.

 sasl_support=no
 CYRUS_SASL=0
 AC_SUBST([CYRUS_SASL])
 sasl_support=no
 CYRUS_SASL=0
 AC_SUBST([CYRUS_SASL])


@@ -594,7 +595,7 @@ dnl On Linux, $AM_CPPFLAGS contains -D_GNU_SOURCE, which makes
 dnl tm_gmtoff visible.
 nmh_saved_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
 dnl tm_gmtoff visible.
 nmh_saved_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"

-AC_CHECK_MEMBER([struct tm.tm_gmtoff],,,[[#include <time.h>]])
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[[#include <time.h>]])

 CPPFLAGS="$nmh_saved_CPPFLAGS"
 
 AC_STRUCT_DIRENT_D_TYPE
 CPPFLAGS="$nmh_saved_CPPFLAGS"
 
 AC_STRUCT_DIRENT_D_TYPE


@@ -644,7 +645,7 @@ RPM build root             : ${nmhrpm}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
 spool default locking type : ${with_locking}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
 spool default locking type : ${with_locking}

-default smtp servers       : ${smtpservers}
+default smtp server        : ${smtpserver}

 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}
 OAuth support              : ${oauth_support}
 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}
 OAuth support              : ${oauth_support}