summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-08 18:30:30 +1200
committerAndrew Bartlett <abartlet@samba.org>2013-05-09 06:18:21 +0200
commita0d16850393f59fef4883fb5fa6c97ec4b2af2c2 (patch)
treeacef33c5f623ac9a51b3338955c690c5b6d4253b
parent76969abba0453b232274520182c0c2cdfab93428 (diff)
downloadsamba-a0d16850393f59fef4883fb5fa6c97ec4b2af2c2.tar.gz
samba-a0d16850393f59fef4883fb5fa6c97ec4b2af2c2.tar.bz2
samba-a0d16850393f59fef4883fb5fa6c97ec4b2af2c2.zip
build: Add vfs_nfs4acl to the autoconf build
Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in1
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4de5cdeb4f..d55a9cddf9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -348,6 +348,8 @@ LIBNDR_PREG_OBJ = autoconf/librpc/gen_ndr/ndr_preg.o \
LIBNDR_XATTR_OBJ = autoconf/librpc/gen_ndr/ndr_xattr.o \
../librpc/ndr/ndr_xattr.o
+LIBNDR_NFS4ACL_OBJ = autoconf/librpc/gen_ndr/ndr_nfs4acl.o
+
LIBCLI_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss_c.o \
rpc_client/cli_spoolss.o \
rpc_client/init_spoolss.o \
@@ -883,7 +885,7 @@ VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o
VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o $(NFS4ACL_OBJ)
VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o
VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o $(NFS4ACL_OBJ)
-VFS_NFS4ACL_XATTR_OBJ = modules/vfs_nfs4acl_xattr.o
+VFS_NFS4ACL_XATTR_OBJ = modules/vfs_nfs4acl_xattr.o $(LIBNDR_NFS4ACL_OBJ) $(NFS4ACL_OBJ)
VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o
VFS_CATIA_OBJ = modules/vfs_catia.o
diff --git a/source3/configure.in b/source3/configure.in
index cb8f730e85..8fef7b19b1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6451,6 +6451,7 @@ SMB_MODULE(vfs_shadow_copy, \$(VFS_SHADOW_COPY_OBJ), "bin/shadow_copy.$SHLIBEXT"
SMB_MODULE(vfs_shadow_copy2, \$(VFS_SHADOW_COPY2_OBJ), "bin/shadow_copy2.$SHLIBEXT", VFS)
SMB_MODULE(vfs_afsacl, \$(VFS_AFSACL_OBJ), "bin/afsacl.$SHLIBEXT", VFS)
SMB_MODULE(vfs_xattr_tdb, \$(VFS_XATTR_TDB_OBJ), "bin/xattr_tdb.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_nfs4acl_xattr, \$(VFS_XATTR_TDB_OBJ), "bin/nfs4acl_xattr.$SHLIBEXT", VFS)
SMB_MODULE(vfs_posixacl, \$(VFS_POSIXACL_OBJ), "bin/posixacl.$SHLIBEXT", VFS)
SMB_MODULE(vfs_aixacl, \$(VFS_AIXACL_OBJ), "bin/aixacl.$SHLIBEXT", VFS)
SMB_MODULE(vfs_aixacl2, \$(VFS_AIXACL2_OBJ), "bin/aixacl2.$SHLIBEXT", VFS)