From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:17:29 +0100 Subject: s4: Remove the old perl/m4/make/mk-based build system. The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104 --- source4/ntvfs/common/config.mk | 11 ----- source4/ntvfs/config.mk | 105 ---------------------------------------- source4/ntvfs/posix/config.m4 | 36 -------------- source4/ntvfs/posix/config.mk | 91 ---------------------------------- source4/ntvfs/sysdep/config.m4 | 27 ----------- source4/ntvfs/sysdep/config.mk | 27 ----------- source4/ntvfs/unixuid/config.m4 | 1 - source4/ntvfs/unixuid/config.mk | 10 ---- 8 files changed, 308 deletions(-) delete mode 100644 source4/ntvfs/common/config.mk delete mode 100644 source4/ntvfs/config.mk delete mode 100644 source4/ntvfs/posix/config.m4 delete mode 100644 source4/ntvfs/posix/config.mk delete mode 100644 source4/ntvfs/sysdep/config.m4 delete mode 100644 source4/ntvfs/sysdep/config.mk delete mode 100644 source4/ntvfs/unixuid/config.m4 delete mode 100644 source4/ntvfs/unixuid/config.mk (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk deleted file mode 100644 index a6957ace2f..0000000000 --- a/source4/ntvfs/common/config.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################ -# Start LIBRARY ntvfs_common -[SUBSYSTEM::ntvfs_common] -PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share -# End LIBRARY ntvfs_common -################################################ - -ntvfs_common_OBJ_FILES = $(addprefix $(ntvfssrcdir)/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/common/proto.h,$(ntvfs_common_OBJ_FILES:.o=.c))) - diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk deleted file mode 100644 index 060ee19115..0000000000 --- a/source4/ntvfs/config.mk +++ /dev/null @@ -1,105 +0,0 @@ -# NTVFS Server subsystem -mkinclude posix/config.mk -mkinclude common/config.mk -mkinclude unixuid/config.mk -mkinclude sysdep/config.mk - -################################################ -# Start MODULE ntvfs_cifs -[MODULE::ntvfs_cifs] -INIT_FUNCTION = ntvfs_cifs_init -SUBSYSTEM = ntvfs -PRIVATE_DEPENDENCIES = \ - LIBCLI_SMB LIBCLI_RAW -# End MODULE ntvfs_cifs -################################################ - -ntvfs_cifs_OBJ_FILES = $(ntvfssrcdir)/cifs/vfs_cifs.o - - -################################################ -# Start MODULE ntvfs_smb2 -[MODULE::ntvfs_smb2] -INIT_FUNCTION = ntvfs_smb2_init -SUBSYSTEM = ntvfs -PRIVATE_DEPENDENCIES = \ - LIBCLI_SMB LIBCLI_RAW -# End MODULE ntvfs_smb2 -################################################ - -ntvfs_smb2_OBJ_FILES = $(ntvfssrcdir)/smb2/vfs_smb2.o - - -################################################ -# Start MODULE ntvfs_simple -[MODULE::ntvfs_simple] -INIT_FUNCTION = ntvfs_simple_init -SUBSYSTEM = ntvfs -# End MODULE ntvfs_simple -################################################ - -ntvfs_simple_OBJ_FILES = $(addprefix $(ntvfssrcdir)/simple/, vfs_simple.o svfs_util.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/simple/proto.h,$(ntvfs_simple_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE ntvfs_cifsposix -[MODULE::ntvfs_cifsposix] -#ENABLE = NO -INIT_FUNCTION = ntvfs_cifs_posix_init -SUBSYSTEM = ntvfs -# End MODULE ntvfs_cifsposix -################################################ - -ntvfs_cifsposix_OBJ_FILES = \ - $(addprefix $(ntvfssrcdir)/cifs_posix_cli/, vfs_cifs_posix.o svfs_util.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/cifs_posix_cli/proto.h,$(ntvfs_cifsposix_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE ntvfs_print -[MODULE::ntvfs_print] -INIT_FUNCTION = ntvfs_print_init -SUBSYSTEM = ntvfs -# End MODULE ntvfs_print -################################################ - -ntvfs_print_OBJ_FILES = $(ntvfssrcdir)/print/vfs_print.o - -################################################ -# Start MODULE ntvfs_ipc -[MODULE::ntvfs_ipc] -SUBSYSTEM = ntvfs -INIT_FUNCTION = ntvfs_ipc_init -PRIVATE_DEPENDENCIES = \ - NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM \ - HEIMDAL_GSSAPI CREDENTIALS -# End MODULE ntvfs_ipc -################################################ - -ntvfs_ipc_OBJ_FILES = $(addprefix $(ntvfssrcdir)/ipc/, vfs_ipc.o ipc_rap.o rap_server.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/ipc/proto.h,$(ntvfs_ipc_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE ntvfs_nbench -[MODULE::ntvfs_nbench] -SUBSYSTEM = ntvfs -INIT_FUNCTION = ntvfs_nbench_init -# End MODULE ntvfs_nbench -################################################ - -ntvfs_nbench_OBJ_FILES = $(ntvfssrcdir)/nbench/vfs_nbench.o - -################################################ -# Start SUBSYSTEM NTVFS -[SUBSYSTEM::ntvfs] - -ntvfs_OBJ_FILES = $(addprefix $(ntvfssrcdir)/, ntvfs_base.o ntvfs_generic.o ntvfs_interface.o ntvfs_util.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/ntvfs_proto.h,$(ntvfs_OBJ_FILES:.o=.c))) - -# PUBLIC_HEADERS += $(ntvfssrcdir)/ntvfs.h -# -# End SUBSYSTEM NTVFS -################################################ diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4 deleted file mode 100644 index a6f79dfbb3..0000000000 --- a/source4/ntvfs/posix/config.m4 +++ /dev/null @@ -1,36 +0,0 @@ - - -dnl ############################################# -dnl see if we have nanosecond resolution for stat -AC_CACHE_CHECK([for tv_nsec nanosecond fields in struct stat],ac_cv_have_stat_tv_nsec,[ -AC_TRY_COMPILE( -[ -#include -#include -#include -], -[struct stat st; - st.st_mtim.tv_nsec; - st.st_atim.tv_nsec; - st.st_ctim.tv_nsec; -], -ac_cv_decl_have_stat_tv_nsec=yes, -ac_cv_decl_have_stat_tv_nsec=no) -]) -if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then - AC_DEFINE(HAVE_STAT_TV_NSEC,1,[Whether stat has tv_nsec nanosecond fields]) -fi - -AC_CHECK_HEADERS(blkid/blkid.h) -AC_SEARCH_LIBS_EXT(blkid_get_cache, [blkid], BLKID_LIBS) -AC_CHECK_FUNC_EXT(blkid_get_cache, $BLKID_LIBS) -SMB_EXT_LIB(BLKID,[${BLKID_LIBS}],[${BLKID_CFLAGS}],[${BLKID_CPPFLAGS}],[${BLKID_LDFLAGS}]) -if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then - AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)]) - SMB_ENABLE(BLKID,YES) -fi - -SMB_ENABLE(pvfs_aio,NO) -if test x"$tevent_cv_aio_support" = x"yes"; then - SMB_ENABLE(pvfs_aio,YES) -fi diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk deleted file mode 100644 index cf4398b91d..0000000000 --- a/source4/ntvfs/posix/config.mk +++ /dev/null @@ -1,91 +0,0 @@ - -[SUBSYSTEM::pvfs_acl] - -pvfs_acl_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl.o - -$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_acl_proto.h,$(pvfs_acl_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE pvfs_acl_xattr -[MODULE::pvfs_acl_xattr] -INIT_FUNCTION = pvfs_acl_xattr_init -SUBSYSTEM = pvfs_acl -PRIVATE_DEPENDENCIES = NDR_XATTR -# End MODULE pvfs_acl_xattr -################################################ - -pvfs_acl_xattr_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_xattr.o - -################################################ -# Start MODULE pvfs_acl_nfs4 -[MODULE::pvfs_acl_nfs4] -INIT_FUNCTION = pvfs_acl_nfs4_init -SUBSYSTEM = pvfs_acl -PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB -# End MODULE pvfs_acl_nfs4 -################################################ - -pvfs_acl_nfs4_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_nfs4.o - -################################################ -[SUBSYSTEM::pvfs_aio] -PRIVATE_DEPENDENCIES = LIBTEVENT LIBTEVENT_EXT -################################################ - -pvfs_aio_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_aio.o - -################################################ -# Start MODULE ntvfs_posix -[MODULE::ntvfs_posix] -SUBSYSTEM = ntvfs -OUTPUT_TYPE = MERGED_OBJ -INIT_FUNCTION = ntvfs_posix_init -#PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4 -PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING \ - LIBWBCLIENT_OLD pvfs_acl pvfs_aio -# End MODULE ntvfs_posix -################################################ - -ntvfs_posix_OBJ_FILES = $(addprefix $(ntvfssrcdir)/posix/, \ - vfs_posix.o \ - pvfs_util.o \ - pvfs_search.o \ - pvfs_dirlist.o \ - pvfs_fileinfo.o \ - pvfs_unlink.o \ - pvfs_mkdir.o \ - pvfs_open.o \ - pvfs_read.o \ - pvfs_flush.o \ - pvfs_write.o \ - pvfs_fsinfo.o \ - pvfs_qfileinfo.o \ - pvfs_setfileinfo.o \ - pvfs_rename.o \ - pvfs_resolve.o \ - pvfs_shortname.o \ - pvfs_lock.o \ - pvfs_oplock.o \ - pvfs_wait.o \ - pvfs_seek.o \ - pvfs_ioctl.o \ - pvfs_xattr.o \ - pvfs_streams.o \ - pvfs_notify.o \ - pvfs_sys.o \ - xattr_system.o \ - xattr_tdb.o) - -$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_posix_proto.h,$(ntvfs_posix_OBJ_FILES:.o=.c))) - -[PYTHON::python_xattr_native] -LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT) -PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR - -python_xattr_native_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_native.o - -[PYTHON::python_xattr_tdb] -LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT) -PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share - -python_xattr_tdb_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o diff --git a/source4/ntvfs/sysdep/config.m4 b/source4/ntvfs/sysdep/config.m4 deleted file mode 100644 index f54f65d08d..0000000000 --- a/source4/ntvfs/sysdep/config.m4 +++ /dev/null @@ -1,27 +0,0 @@ -AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h sys/inotify.h) -AC_CHECK_FUNC(inotify_init) -AC_HAVE_DECL(__NR_inotify_init, [#include ]) - -SMB_ENABLE(sys_notify_inotify, NO) - -if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_sys_inotify_h" = x"yes"; then - SMB_ENABLE(sys_notify_inotify, YES) -fi - -if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then - SMB_ENABLE(sys_notify_inotify, YES) -fi - -if test x"$ac_cv_header_linux_inotify_h" = x"yes" -a x"$ac_cv_have___NR_inotify_init_decl" = x"yes"; then - SMB_ENABLE(sys_notify_inotify, YES) -fi - -AC_HAVE_DECL(F_SETLEASE, [#include ]) -AC_HAVE_DECL(SA_SIGINFO, [#include ]) - -SMB_ENABLE(sys_lease_linux, NO) - -if test x"$ac_cv_have_F_SETLEASE_decl" = x"yes" \ - -a x"$ac_cv_have_SA_SIGINFO_decl" = x"yes"; then - SMB_ENABLE(sys_lease_linux, YES) -fi diff --git a/source4/ntvfs/sysdep/config.mk b/source4/ntvfs/sysdep/config.mk deleted file mode 100644 index 5feca6143a..0000000000 --- a/source4/ntvfs/sysdep/config.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################ -# Start MODULE sys_notify_inotify -[MODULE::sys_notify_inotify] -SUBSYSTEM = sys_notify -INIT_FUNCTION = sys_notify_inotify_init -PRIVATE_DEPENDENCIES = LIBEVENTS -# End MODULE sys_notify_inotify -################################################ - -sys_notify_inotify_OBJ_FILES = $(ntvfssrcdir)/sysdep/inotify.o - -################################################ -# Start SUBSYSTEM sys_notify -[SUBSYSTEM::sys_notify] -# End SUBSYSTEM sys_notify -################################################ - -sys_notify_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_notify.o - -[SUBSYSTEM::sys_lease_linux] -PRIVATE_DEPENDENCIES = LIBTEVENT - -sys_lease_linux_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_lease_linux.o - -[SUBSYSTEM::sys_lease] - -sys_lease_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_lease.o diff --git a/source4/ntvfs/unixuid/config.m4 b/source4/ntvfs/unixuid/config.m4 deleted file mode 100644 index cb870d9e16..0000000000 --- a/source4/ntvfs/unixuid/config.m4 +++ /dev/null @@ -1 +0,0 @@ -AC_CHECK_FUNCS(setgroups) diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk deleted file mode 100644 index 105ba2f535..0000000000 --- a/source4/ntvfs/unixuid/config.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################ -# Start MODULE ntvfs_unixuid -[MODULE::ntvfs_unixuid] -INIT_FUNCTION = ntvfs_unixuid_init -SUBSYSTEM = ntvfs -PRIVATE_DEPENDENCIES = SAMDB NSS_WRAPPER UID_WRAPPER -# End MODULE ntvfs_unixuid -################################################ - -ntvfs_unixuid_OBJ_FILES = $(ntvfssrcdir)/unixuid/vfs_unixuid.o -- cgit