From: Brian Aker <brian@tangent.org>
Date: Thu, 13 Dec 2012 02:48:43 +0000 (-0500)
Subject: Update/fix for SASL
X-Git-Tag: 1.0.15~4^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4b5f525d64e1a1685b66880822b78d351ea55a82;p=awesomized%2Flibmemcached

Update/fix for SASL
---

diff --git a/configure.ac b/configure.ac
index 19e56af8..b66c05fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,7 @@ echo "   * Assertions enabled:        $ax_enable_assert"
 echo "   * Debug enabled:             $ax_enable_debug"
 echo "   * Shared:                    $enable_shared"
 echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
-echo "   * SASL support:              $ax_sasl_option"
+echo "   * SASL support:              $ac_enable_sasl"
 echo "   * make -j:                   $enable_jobserver"
 echo "   * VCS checkout:              $ac_cv_vcs_checkout"
 echo ""
diff --git a/libmemcached/include.am b/libmemcached/include.am
index 2465b058..e026e1a0 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -116,9 +116,11 @@ libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION
 libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
 
 if HAVE_SASL
+if HAVE_LIBSASL
 libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
-libmemcached_libmemcached_la_LIBADD+= @SASL_LIB@
+libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
+endif
 endif
 
 if HAVE_DTRACE
diff --git a/m4/ax_sasl.m4 b/m4/ax_sasl.m4
index 00aaa124..aa0bd1b7 100644
--- a/m4/ax_sasl.m4
+++ b/m4/ax_sasl.m4
@@ -23,23 +23,21 @@
 #serial 2
 
 AC_DEFUN([AX_SASL_OPTION],
-    [AC_ARG_ENABLE([sasl],
+    [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])
 
-    ax_sasl_option=no
     AS_IF([test "x${ac_enable_sasl}" = xyes],
-      [AX_SASL_CHECK
-      echo "$ax_sasl_check"
+      [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])
+        ac_enable_sasl=no
+        ax_sasl_option=no])
+      AC_MSG_RESULT(["$ax_sasl_option"])
       ])
-
-    AC_MSG_CHECKING([checking to see if enabling sasl])
-    AC_MSG_RESULT(["$ax_sasl_option"])
     AM_CONDITIONAL([HAVE_SASL],[test "x${ax_sasl_option}" = xyes])
     ])