Merge remote branch 'sf/develop' into develop

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 6ae3fab2b0d51ac2a6191652376333e40c817c2f..61994a80d2af9b1df194aec07ae32f5ce92c9535 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -101,7 +101,7 @@ dnl Check for optional cracklib support
 AC_DEFUN([AC_NETATALK_CRACKLIB], [
 netatalk_cv_with_cracklib=no
 AC_ARG_WITH(cracklib,
-       [  --with-cracklib=DICT    enable/set location of cracklib dictionary],[
+       [  --with-cracklib[[=DICT]]  enable/set location of cracklib dictionary [[no]]],[
        if test "x$withval" != "xno" ; then
                cracklib="$withval"
                AC_CHECK_LIB(crack, main, [