LU-2675 build: remove Darwin "support"

[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index b8be8cf..e42acbf 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -37,7 +37,7 @@ AC_SUBST(pkgexampledir)
 #
 AC_DEFUN([LC_TARGET_SUPPORTED], [
 case $target_os in
-       linux* | darwin*)
+       linux*)
 $1
                ;;
        *)
@@ -1419,7 +1419,7 @@ kiocb_ki_left, [
 #
 # LC_VFS_RENAME_5ARGS
 #
-# 3.13 has vfs_renane with 5 args
+# 3.13 has vfs_rename with 5 args
 #
 AC_DEFUN([LC_VFS_RENAME_5ARGS], [
 LB_CHECK_COMPILE([if Linux kernel has 'vfs_rename' with 5 args],
@@ -1436,7 +1436,7 @@ vfs_rename_5args, [
 #
 # LC_VFS_UNLINK_3ARGS
 #
-# 3.13 has vfs_renane with 3 args
+# 3.13 has vfs_unlink with 3 args
 #
 AC_DEFUN([LC_VFS_UNLINK_3ARGS], [
 LB_CHECK_COMPILE([if Linux kernel has 'vfs_unlink' with 3 args],
@@ -1470,6 +1470,23 @@ have_bvec_iter, [
 ]) # LC_HAVE_BVEC_ITER
 
 #
+# LC_VFS_RENAME_6ARGS
+#
+# 3.15 has vfs_rename with 6 args
+#
+AC_DEFUN([LC_VFS_RENAME_6ARGS], [
+LB_CHECK_COMPILE([if Linux kernel has 'vfs_rename' with 6 args],
+vfs_rename_6args, [
+       #include <linux/fs.h>
+],[
+       vfs_rename(NULL, NULL, NULL, NULL, NULL, NULL);
+], [
+       AC_DEFINE(HAVE_VFS_RENAME_6ARGS, 1,
+               [kernel has vfs_rename with 6 args])
+])
+]) # LC_VFS_RENAME_6ARGS
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1590,6 +1607,9 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 3.14
        LC_HAVE_BVEC_ITER
 
+       # 3.15
+       LC_VFS_RENAME_6ARGS
+
        #
        AS_IF([test "x$enable_server" != xno], [
                LC_FUNC_DEV_SET_RDONLY
@@ -1924,8 +1944,8 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre_ver.h
 lustre/include/linux/Makefile
-lustre/include/darwin/Makefile
 lustre/include/lustre/Makefile
+lustre/kernel_patches/targets/3.10-rhel7.target
 lustre/kernel_patches/targets/2.6-rhel6.target
 lustre/kernel_patches/targets/2.6-rhel5.target
 lustre/kernel_patches/targets/2.6-sles11.target
@@ -1940,7 +1960,6 @@ lustre/fid/Makefile
 lustre/fid/autoMakefile
 lustre/llite/Makefile
 lustre/llite/autoMakefile
-lustre/lclient/Makefile
 lustre/lov/Makefile
 lustre/lov/autoMakefile
 lustre/mdc/Makefile
@@ -1992,6 +2011,5 @@ lustre/osp/Makefile
 lustre/osp/autoMakefile
 lustre/lod/Makefile
 lustre/lod/autoMakefile
-lustre/obdclass/darwin/Makefile
 ])
 ]) # LC_CONFIG_FILES