From: Brian Aker <brian@tangent.org>
Date: Sat, 7 Apr 2012 00:33:40 +0000 (-0700)
Subject: Fix for sasl compile.
X-Git-Tag: 1.0.6~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ce63c3675f8176c7d7d02af761a09f282633e95e;p=awesomized%2Flibmemcached

Fix for sasl compile.
---

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")
     ])