Revert change from 3194183

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 85f38a9e87d479c3b85533379c72294420145f09..125f51fb498359031a32969f961d72a92cc8accd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -828,7 +828,7 @@ if test x"$this_os" = "xsolaris"; then
 
        solaris_module=no
        AC_MSG_CHECKING([if we can build Solaris kernel module])
-       if test -x /usr/ccs/bin/ld && test x$netatalk_cv_ddp_enabled = yes ; then
+       if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; then
                solaris_module=yes
        fi
        AC_MSG_RESULT([$solaris_module])
@@ -1023,19 +1023,26 @@ AC_ARG_ENABLE(overwrite,
 AC_MSG_RESULT([$OVERWRITE_CONFIG])
 
 dnl --------------------- check for ACL support
-neta_cv_nfsv4acl="no"
 AC_MSG_CHECKING([if NFSv4 ACL Support should be enabled])
 AC_ARG_ENABLE(nfsv4acls,
-       [  --enable-nfsv4acls      enable NFSv4 ACL Support],[
+       [  --enable-nfsv4acls      enable NFSv4 ACL Support (auto)],[
        if test x"$enableval" = x"yes"; then
           AC_MSG_RESULT([yes])
           neta_cv_nfsv4acl="yes"
        else
           AC_MSG_RESULT([no])
+          neta_cv_nfsv4acl="no"
        fi],[
-          AC_MSG_RESULT([no])
+          AC_MSG_RESULT([auto])
+          neta_cv_nfsv4acl="yes"
        ]
 )
+
+if test x"$this_os" != x"solaris" && test x"$neta_cv_nfsv4acl" = x"yes" ; then
+               AC_MSG_NOTICE([NFSv4 ACL Support only available on (Open)Solaris])
+        neta_cv_nfsv4acl="no"
+fi
+
 if test x$neta_cv_nfsv4acl = xyes; then
        AC_CHECK_HEADER([ldap.h],,[
                AC_MSG_ERROR([ACL Support need the LDAP client headers not found.])