Don't error out if the message body is empty.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 750b1e74f47d81d4ed60fda8c4eb85aaa6948f88..4f7229a35a5ec7580123e2d14a707180f7192650 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,15 @@ if test -n "$auto_cflags"; then
                  CFLAGS="$nmh_saved_cflags"])
   test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
 
                  CFLAGS="$nmh_saved_cflags"])
   test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
 

+  AC_CACHE_CHECK([whether compiler supports -Wno-unused-result],
+                 [nmh_cv_has_wnur],
+                 [nmh_saved_cflags="$CFLAGS"
+                 CFLAGS="$CFLAGS -Wno-unused-result -Werror"
+                 AC_TRY_COMPILE([],[],nmh_cv_has_wnur=yes,nmh_cv_has_wnur=no)
+                 CFLAGS="$nmh_saved_cflags"])
+  test "$nmh_cv_has_wnur" = "yes"  && \
+    CFLAGS="${CFLAGS:+$CFLAGS }-Wno-unused-result"
+

   AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
                  [nmh_saved_cflags="$CFLAGS"
                  CFLAGS="$CFLAGS -Wextra -Werror"
   AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
                  [nmh_saved_cflags="$CFLAGS"
                  CFLAGS="$CFLAGS -Wextra -Werror"


@@ -158,30 +167,17 @@ AC_SUBST([POSTLINK])
 dnl -----------------
 dnl CUSTOMIZE LDFLAGS
 dnl -----------------
 dnl -----------------
 dnl CUSTOMIZE LDFLAGS
 dnl -----------------

-if test "$GCC" = yes; then
+AS_IF([test "$GCC" = yes  &&  `${CC} --version 2>&1 | grep clang >/dev/null`],

   dnl Disable clang complaint about unused -ansi when linking.
   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"])
-  test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
-    LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"
-fi
-
-dnl This really shouldn't be necessary.  And we really shouldn't add -s.
-if test x"$enable_debug" = x"yes"; then
-  test -z "$LDFLAGS" && LDFLAGS=-g
-else
-  if test -z "$LDFLAGS"; then
-    case "$build_os" in
-      darwin*) LDFLAGS= ;;
-            *) LDFLAGS=-s ;;
-    esac
-  fi
-fi
+  [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"])])
+test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
+  LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"

 
 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


@@ -486,11 +482,14 @@ dnl CHECK FOR OPENSSL
 dnl -----------------
 
 AS_IF([test x"$tls_support" = x"yes"],[
 dnl -----------------
 
 AS_IF([test x"$tls_support" = x"yes"],[

+  dnl OpenBSD 5 needs the other-libraries (fourth argument) to the
+  dnl AC_CHECK_LIB for SSL_library_init, because it doesn't
+  dnl automatically append -lcrypto when linking with -lssl.

   AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
   AC_CHECK_LIB([crypto], [BIO_write], [TLSLIB="-lcrypto"],
     [AC_MSG_ERROR([OpenSSL crypto library not found])])
   AC_CHECK_LIB([ssl], [SSL_library_init], [TLSLIB="-lssl $TLSLIB"],
   AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
   AC_CHECK_LIB([crypto], [BIO_write], [TLSLIB="-lcrypto"],
     [AC_MSG_ERROR([OpenSSL crypto library not found])])
   AC_CHECK_LIB([ssl], [SSL_library_init], [TLSLIB="-lssl $TLSLIB"],

-    [AC_MSG_ERROR([OpenSSL library not found])])],
+    [AC_MSG_ERROR([OpenSSL library not found])],[$TLSLIB])],

   [TLSLIB=])
 AC_SUBST([TLSLIB])
 
   [TLSLIB=])
 AC_SUBST([TLSLIB])
 


@@ -503,11 +502,9 @@ dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
                [flex\ 2.5.35], [LFLAGS=\
 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 $@; \
-true'],
+'; sed -e "s/  int n;/ size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@; true'],

                [flex\ 2.5.36], [LFLAGS=\
                [flex\ 2.5.36], [LFLAGS=\

-'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@; \
-true'])
+'; sed -s "s/\(        \)int i;/\1yy_size_t i;/" $@ >$.tmp && mv -f $@.tmp $@; true'])

        AC_SUBST([LFLAGS])])
 
 dnl ----------------
        AC_SUBST([LFLAGS])])
 
 dnl ----------------