X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_sasl.m4;h=44bb65e3c54b296cd190c225a919c7a7dc9711c7;hb=6730933820b3c3f7b016b4d33a209198d195a37a;hp=c11efb9c396cfaec0a9d95aa8ee622565b32e5a5;hpb=5993f4b91e77db90cc0abfb675d903a05d3c5261;p=awesomized%2Flibmemcached

diff --git a/m4/ax_sasl.m4 b/m4/ax_sasl.m4
index c11efb9c..44bb65e3 100644
--- a/m4/ax_sasl.m4
+++ b/m4/ax_sasl.m4
@@ -5,10 +5,11 @@
 # SYNOPSIS
 #
 #   AX_SASL
+#   AX_SASL_CHECK
 #
 # DESCRIPTION
 #
-#   Check for sasl version one or two support.
+#   Check to see if libsasl is requested and available.
 #
 # LICENSE
 #
@@ -19,36 +20,32 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#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_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])
 
-    AS_IF([test "x$ac_enable_sasl" = "xyes"], [
-      AS_IF([test "x$ax_cv_sasl" = "xyes"], [
-        AC_DEFINE([HAVE_LIBSASL], [ 1 ], [Have libsasl2])
-        ], [
-        AC_DEFINE([HAVE_LIBSASL], [ 0 ], [Have libsasl2])
-        ac_enable_sasl= no 
-        ])
-      ], [
-      AC_DEFINE([HAVE_LIBSASL], [ 0 ], [Have libsasl2])
-      ])
-
-    AM_CONDITIONAL(HAVE_SASL, test "x${ac_enable_sasl}" = "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_CHECK_LIBRARY([LIBSASL], [sasl/sasl.h], [sasl2],[
-      LIBSASL_LDFLAGS="-lsasl2"
-      ax_cv_sasl=yes
-      ], [
-      ax_cv_sasl=no 
-      ])
-    ])
+         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"])
+         ])