Suppress getcanon exit status check.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 234ff3c43f0b4700d2854bc934076f4a0604d20d..ae98df841fcec2b06995cdea30a779aab87e3dbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"
+AC_SUBST([AM_LDFLAGS])
 
 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 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])
@@ -587,13 +588,15 @@ dnl ----------------
 dnl CHECK STRUCTURES
 dnl ----------------
 
-dnl FIXME: This test could work on Linux if _BSD_SOURCE was #define'd
-dnl according to localtime(3).
-dnl
 dnl For platforms such as FreeBSD that have tm_gmtoff in struct tm.
 dnl (FreeBSD has a timezone() function but not a timezone global
 dnl variable that is visible).
-AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+dnl On Linux, $AM_CPPFLAGS contains -D_GNU_SOURCE, which makes
+dnl tm_gmtoff visible.
+nmh_saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[[#include <time.h>]])
+CPPFLAGS="$nmh_saved_CPPFLAGS"
 
 AC_STRUCT_DIRENT_D_TYPE