svn commit: samba r22217 - in branches/SAMBA_4_0/source/lib/replace/system: .

[metze at samba.org]

Author: metze
Date: 2007-04-15 16:30:01 +0000 (Sun, 15 Apr 2007)
New Revision: 22217

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22217

Log:
merge from samba3 21944:

move acl header checks to the correct place only

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/system/config.m4
   branches/SAMBA_4_0/source/lib/replace/system/filesys.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/system/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/config.m4	2007-04-15 16:13:06 UTC (rev 22216)
+++ branches/SAMBA_4_0/source/lib/replace/system/config.m4	2007-04-15 16:30:01 UTC (rev 22217)
@@ -1,6 +1,7 @@
 # filesys
 AC_HEADER_DIRENT 
-AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/acl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h )
+AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
 
 # select
 AC_CHECK_HEADERS(sys/select.h)

Modified: branches/SAMBA_4_0/source/lib/replace/system/filesys.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/filesys.h	2007-04-15 16:13:06 UTC (rev 22216)
+++ branches/SAMBA_4_0/source/lib/replace/system/filesys.h	2007-04-15 16:30:01 UTC (rev 22217)
@@ -41,6 +41,10 @@
 #include <sys/acl.h>
 #endif
 
+#ifdef HAVE_ACL_LIBACL_H
+#include <acl/libacl.h>
+#endif
+
 #ifdef HAVE_SYS_FS_S5PARAM_H 
 #include <sys/fs/s5param.h>
 #endif