From ce63c3675f8176c7d7d02af761a09f282633e95e Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 6 Apr 2012 17:33:40 -0700
Subject: [PATCH] Fix for sasl compile.

---
 configure.ac  | 2 +-
 m4/ax_sasl.m4 | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 23fc8cf4..1ff7b29b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,7 @@ AC_C_RESTRICT
 
 AX_CXX_GCC_ABI_DEMANGLE
 
-AX_SASL_OPTION
+AX_SASL_CHECK
 
 dnl
 dnl The sasl functions should only be visible if we build with sasl support
diff --git a/m4/ax_sasl.m4 b/m4/ax_sasl.m4
index b34a8a77..b2b91de7 100644
--- a/m4/ax_sasl.m4
+++ b/m4/ax_sasl.m4
@@ -28,9 +28,9 @@ AC_DEFUN([AX_SASL_OPTION],[
       [ac_enable_sasl="$enableval"],
       [ac_enable_sasl="yes"])
 
-    AS_IF([test "x$ac_enable_sasl" = "xyes"], [
-      ac_enable_sasl="no"
-      ])
+    AS_IF([test "x$ac_enable_sasl" = "xyes"],
+      [ac_enable_sasl="yes"],
+      [ac_enable_sasl="no"])
 
     AS_IF([test "x$ac_enable_sasl" = "xyes"], [
       AC_DEFINE([HAVE_LIBSASL], [ 1 ], [Have libsasl2])
@@ -50,4 +50,6 @@ AC_DEFUN([AX_SASL_CHECK],[
       ], [
       ax_cv_sasl=no 
       ])
+
+    AM_CONDITIONAL(HAVE_SASL, test "x${ac_enable_sasl}" = "xyes")
     ])
-- 
2.30.2