--- configure.in.orig	Mon Apr  9 19:31:00 2007
+++ configure.in	Wed Apr 18 03:30:37 2007
@@ -5075,7 +5090,7 @@
 #################################################
 # check for ACL support
 
-AC_MSG_CHECKING(whether to support ACLs)
+AC_MSG_NOTICE(checking whether to support ACLs...)
 AC_ARG_WITH(acl-support,
 [  --with-acl-support      Include ACL support (default=no)],
 [ case "$withval" in
@@ -5083,42 +5098,37 @@
 
 	case "$host_os" in
 	*sysv5*)
-		AC_MSG_RESULT(Using UnixWare ACLs)
+		AC_MSG_NOTICE(Using UnixWare ACLs)
 		AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
 		default_static_modules="$default_static_modules vfs_solarisacl"
 		;;
 	*solaris*)
-		AC_MSG_RESULT(Using solaris ACLs)
-		AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
+		AC_MSG_NOTICE(Using Solaris ACLs)
+		AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether Solaris ACLs are available])
 		ACL_LIBS="$ACL_LIBS -lsec"
 		default_static_modules="$default_static_modules vfs_solarisacl"
 		;;
 	*hpux*)
-		AC_MSG_RESULT(Using HPUX ACLs)
+		AC_MSG_NOTICE(Using HPUX ACLs)
 		AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
 		default_static_modules="$default_static_modules vfs_hpuxacl"
 		;;
 	*irix*)
-		AC_MSG_RESULT(Using IRIX ACLs)
+		AC_MSG_NOTICE(Using IRIX ACLs)
 		AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
 		default_static_modules="$default_static_modules vfs_irixacl"
 		;;
 	*aix*)
-		AC_MSG_RESULT(Using AIX ACLs)
+		AC_MSG_NOTICE(Using AIX ACLs)
 		AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
 		default_static_modules="$default_static_modules vfs_aixacl"
 		;;
 	*osf*)
-		AC_MSG_RESULT(Using Tru64 ACLs)
+		AC_MSG_NOTICE(Using Tru64 ACLs)
 		AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
 		ACL_LIBS="$ACL_LIBS -lpacl"
 		default_static_modules="$default_static_modules vfs_tru64acl"
 		;;
-	*freebsd[[5-9]]*)
-		AC_MSG_RESULT(Using FreeBSD posix ACLs)
-		AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
-		AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
-		;;
 	*linux*)
 		AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
        		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
@@ -5139,7 +5149,7 @@
 			LIBS=$acl_LIBS
 		])
 		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
-			AC_MSG_RESULT(Using posix ACLs)
+			AC_MSG_NOTICE(Using posix ACLs)
 			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
 			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
 				acl_LIBS=$LIBS
@@ -5160,12 +5170,18 @@
 				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
 			fi
 		fi
-            ;;
+		;;
          *)
-		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
-		AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
+		AC_CHECK_LIB(acl,acl_get_file,[
+		    ACL_LIBS="$ACL_LIBS -lacl"
+		    samba_cv_acl_get_file=yes
+		],[
+		    AC_CHECK_FUNC(acl_get_file,[samba_cv_acl_get_file=yes])
+		])
+		if test x"$samba_cv_acl_get_file" = x"yes"; then
+		    AC_CACHE_CHECK([for POSIX ACL support],samba_cv_HAVE_POSIX_ACLS,[
 			acl_LIBS=$LIBS
-			LIBS="$LIBS -lacl"
+			LIBS="$LIBS $ACL_LIBS"
 			AC_TRY_LINK([
 				#include <sys/types.h>
 				#include <sys/acl.h>
@@ -5178,20 +5194,20 @@
 			[samba_cv_HAVE_POSIX_ACLS=yes],
 			[samba_cv_HAVE_POSIX_ACLS=no])
 			LIBS=$acl_LIBS
-		])
-		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
-			AC_MSG_RESULT(Using posix ACLs)
+		    ])
+		    if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+			AC_MSG_NOTICE(Using POSIX ACLs)
 			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
 			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
 				acl_LIBS=$LIBS
-				LIBS="$LIBS -lacl"
+				LIBS="$LIBS $ACL_LIBS"
 				AC_TRY_LINK([
 					#include <sys/types.h>
 					#include <sys/acl.h>
 				],[
 					acl_permset_t permset_d;
 					acl_perm_t perm;
-					return acl_get_perm_np( permset_d, perm);
+					return acl_get_perm_np(permset_d, perm);
 				],
 				[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
 				[samba_cv_HAVE_ACL_GET_PERM_NP=no])
@@ -5200,17 +5216,22 @@
 			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
 				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
 			fi
+		    fi
+		fi
+		if test x"$samba_cv_HAVE_POSIX_ACLS" != x"yes"; then
+		    AC_MSG_NOTICE(No POSIX ACLs support is availble)
+		    AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
 		fi
             ;;
         esac
         ;;
   *)
-    AC_MSG_RESULT(no)
+    AC_MSG_NOTICE(No ACLs support is availble)
     AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
     ;;
   esac ],
+  AC_MSG_NOTICE(No ACLs support is built in)
   AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
-  AC_MSG_RESULT(no)
 )
 
 if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then