Merge master

diff --cc config/Makefile.am
Simple merge

diff --cc configure.in
Simple merge

diff --cc etc/afpd/Makefile.am
Simple merge

diff --cc etc/cnid_dbd/db_param.h
Simple merge

diff --cc macros/summary.m4
index 84109816bb7fa590a12345d5f14b29e1d9f0c50b,7f567ca5800c6a727776b972ff4b9e2bd812b218..744c4f2b7f8e05aade37cece7e06728fbbd0a49d
--- 1/macros/summary.m4
--- 2/macros/summary.m4
+++ b/macros/summary.m4
@@@ -51,7 -59,11 +51,9 @@@ dnl  f
        AC_MSG_RESULT([         admin group support:     $netatalk_cv_admin_group])
        AC_MSG_RESULT([         valid shell check:       $netatalk_cv_use_shellcheck])
        AC_MSG_RESULT([         cracklib support:        $netatalk_cv_with_cracklib])
 -      AC_MSG_RESULT([         dropbox kludge:          $netatalk_cv_dropkludge])
 -      AC_MSG_RESULT([         force volume uid/gid:    $netatalk_cv_force_uidgid])
 -      AC_MSG_RESULT([         Apple 2 boot support:    $compile_a2boot])
 +      AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
+       AC_MSG_RESULT([         ACL support:             $with_acl_support])
+       AC_MSG_RESULT([         LDAP support:            $with_ldap])
        if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])