X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_sasl.m4;h=aa0bd1b770f5b83c5517c66b09d9edc2861d5f3b;hb=4b5f525d64e1a1685b66880822b78d351ea55a82;hp=00aaa124a4f868146aee9d3955e931c5c6794fcd;hpb=a1dc0c7336cf2645c7b575a6b0140c500dbaf0f9;p=m6w6%2Flibmemcached 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]) ])