fix build for RHEL6

RHEL6 doesn't have the function sasl_client_done().

diff --git a/auto.def b/auto.def
index e713493b7b689c39d971ea53d6ecb1b071b7524c..17fda241b87a9aeef580bfe319bd14447a8f3483 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -366,6 +366,8 @@ if {[get-define want-sasl]} {
   foreach sasl_lib {sasl2 sasl} {
     if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
                            sasl/sasl.h sasl_encode64 $sasl_lib]} {
+      # RHEL6 doesn't have this function yet
+      cc-check-functions sasl_client_done
       define USE_SASL
       break
     }

diff --git a/conn/sasl.c b/conn/sasl.c
index 8bf984ab408d4f029c3510eab2ad7c94265a1d6b..99fcca1b637cba14d4235b394bf4720a219a43ea 100644 (file)
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -730,6 +730,10 @@ void mutt_sasl_setup_conn(struct Connection *conn, sasl_conn_t *saslconn)
  */
 void mutt_sasl_done(void)
 {
+#ifdef HAVE_SASL_CLIENT_DONE
   /* As we never use the server-side, the silently ignore the return value */
   sasl_client_done();
+#else
+  sasl_done();
+#endif
 }