From: Brian Aker <brian@tangent.org>
Date: Wed, 20 Nov 2013 20:14:53 +0000 (-0500)
Subject: Fix for SASL compile issue.
X-Git-Tag: 1.0.18~14^2~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=59eb699744f35218cbf8e6d5b2d831c81575452d;p=m6w6%2Flibmemcached

Fix for SASL compile issue.
---

diff --git a/m4/ax_sasl.m4 b/m4/ax_sasl.m4
index aa0bd1b7..44bb65e3 100644
--- a/m4/ax_sasl.m4
+++ b/m4/ax_sasl.m4
@@ -20,33 +20,32 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 2
+#serial 3
 
 AC_DEFUN([AX_SASL_OPTION],
-    [AC_REQUIRE([AX_SASL_CHECK])
-    AC_ARG_ENABLE([sasl],
-      [AS_HELP_STRING([--disable-sasl], [Build with sasl support @<:@default=on@:>@])],
-      [ac_enable_sasl="$enableval"],
-      [ac_enable_sasl=yes])
+         [AC_REQUIRE([AX_SASL_CHECK])
+         AC_ARG_ENABLE([sasl],
+                       [AS_HELP_STRING([--disable-sasl], [Build with sasl support @<:@default=on@:>@])],
+                       [ac_enable_sasl="$enableval"],
+                       [ac_enable_sasl=yes])
 
-    AS_IF([test "x${ac_enable_sasl}" = xyes],
-      [AC_MSG_CHECKING([checking to see if enabling sasl])
-      AS_IF([test "x${ax_sasl_check}" = xyes],
-        [ax_sasl_option=yes],
-        [AC_MSG_WARN([request to add sasl support failed, please see config.log])
-        ac_enable_sasl=no
-        ax_sasl_option=no])
-      AC_MSG_RESULT(["$ax_sasl_option"])
-      ])
-    AM_CONDITIONAL([HAVE_SASL],[test "x${ax_sasl_option}" = xyes])
-    ])
+         AS_IF([test "x${ac_enable_sasl}" = xyes],[
+               AC_MSG_CHECKING([checking to see if enabling sasl])
+               AS_IF([test "x${ax_sasl_check}" = xyes],[
+                     ax_sasl_option=yes],[
+                     AC_MSG_WARN([request to add sasl support failed, please see config.log])
+                     ac_enable_sasl=no
+                     ax_sasl_option=no])
+               AC_MSG_RESULT(["$ax_sasl_option"])],[
+               ax_sasl_option=no])
+         AM_CONDITIONAL([HAVE_SASL],[test "x${ax_sasl_option}" = xyes])
+         ])
 
-AC_DEFUN([AX_SASL_CHECK],
-    [ax_sasl_check=no
-    AX_CHECK_LIBRARY([LIBSASL],[sasl/sasl.h],[sasl2],
-      [ax_sasl_check=yes
-      AC_SUBST([SASL_LIB],[[-lsasl2]])
-      ])
-    AC_MSG_CHECKING([checking to see if sasl works])
-    AC_MSG_RESULT(["$ax_sasl_check"])
-    ])
+AC_DEFUN([AX_SASL_CHECK],[
+         AX_CHECK_LIBRARY([LIBSASL],[sasl/sasl.h],[sasl2],[
+                          ax_sasl_check=yes
+                          AC_SUBST([SASL_LIB],[[-lsasl2]])],[
+                          ax_sasl_check=no])
+         AC_MSG_CHECKING([checking to see if sasl works])
+         AC_MSG_RESULT(["$ax_sasl_check"])
+         ])