Fix for sasl compile.

diff --git a/configure.ac b/configure.ac
index 23fc8cf4b91abf7ae3c0e6ce110ccde712a4180f..1ff7b29bdeaf5097761651016dc7e4e0dc139939 100644 (file)
--- 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 b34a8a7785a29089622fa6afd21c5fcdd08ebd71..b2b91de79d88a7985c3bc0b06c5e575d8ab7721b 100644 (file)
--- 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")
     ])