CDRIVER-530 check for sasl_client_done

(cherry picked from commit 672670c)

Author: ajdavis

build/autotools/CheckSasl.m4

@@ -43,17 +43,17 @@ dnl Let mongoc-config.h.in know about SASL status.
 if test "$sasl_mode" != "no" ; then
   AC_SUBST(MONGOC_ENABLE_SASL, 1)
 
-  AC_MSG_CHECKING([for sasl_client_done])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sasl/sasl.h>]],
-                                  [[sasl_client_done ();]])],
-                 [AC_MSG_RESULT(yes)
-                  have_sasl_client_done=yes],
-                 [AC_MSG_RESULT(no)
-                  have_sasl_client_done=no])
-  AS_IF([test "$have_sasl_client_done" = "yes"],
-        [AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)],
-        [AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)])
+  AC_CHECK_LIB([sasl2],[sasl_client_done],
+               [have_sasl_client_done=yes],
+               [have_sasl_client_done=no])
+
+  if test "have_sasl_client_done" = "yes" ; then
+    AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
+  else
+    AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
+  fi
 
 else
   AC_SUBST(MONGOC_ENABLE_SASL, 0)
+  AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
 fi

src/mongoc/mongoc-config.h.in

@@ -41,4 +41,16 @@
 #endif
 
 
+/*
+ * MONGOC_HAVE_SASL_CLIENT_DONE is set from configure to determine if we
+ * have SASL and its version is new enough to use sasl_client_done (),
+ * which supersedes sasl_done ().
+ */
+#define MONGOC_HAVE_SASL_CLIENT_DONE @MONGOC_HAVE_SASL_CLIENT_DONE@
+
+#if MONGOC_HAVE_SASL_CLIENT_DONE != 1
+#  undef MONGOC_HAVE_SASL_CLIENT_DONE
+#endif
+
+
 #endif /* MONGOC_CONFIG_H */

src/mongoc/mongoc-init.c

@@ -135,9 +135,13 @@ static MONGOC_ONCE_FUN( _mongoc_do_cleanup)
    _mongoc_ssl_cleanup();
 #endif
 
-   /* apple's libsasl package somehow lacks sasl_client_done before 2.1.24 */
-#if MONGOC_HAVE_SASL_CLIENT_DONE
-      sasl_client_done ();
+#ifdef MONGOC_ENABLE_SASL
+#ifdef MONGOC_HAVE_SASL_CLIENT_DONE
+   sasl_client_done ();
+#else
+   /* fall back to deprecated function */
+   sasl_done ();
+#endif
 #endif
 
 #ifdef _WIN32