LU-6023 build: fix libselinux 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 07e19b6..d9b2993 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1746,22 +1746,6 @@ AS_IF([test "x$enable_quota" != xno -a "x$enable_utils" != xno], [
 ]) # LC_QUOTA
 
 #
-# LC_CONFIG_SPLIT
-#
-# whether to enable split support
-#
-AC_DEFUN([LC_CONFIG_SPLIT], [
-AC_MSG_CHECKING([whether to enable split support])
-AC_ARG_ENABLE([split],
-       AC_HELP_STRING([--enable-split],
-               [enable split support]),
-       [], [enable_split='no'])
-AC_MSG_RESULT([$enable_split])
-AS_IF([test "x$enable_split" != xno],
-    [AC_DEFINE(HAVE_SPLIT_SUPPORT, 1, [enable split support])])
-]) # LC_CONFIG_SPLIT
-
-#
 # LC_CONFIG_NODEMAP_PROC_DEBUG
 #
 # enable nodemap proc file debugging
@@ -1856,9 +1840,8 @@ AS_IF([test $target_cpu == "i686" -o $target_cpu == "x86_64"],
 # maximum MDS thread count
 LC_MDS_MAX_THREADS
 
-# libcfs/include/libcfs/posix/libcfs.h
 # lustre/utils/llverdev.c
-AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
+AC_CHECK_HEADERS([blkid/blkid.h])
 
 # libcfs/include/libcfs/linux/linux-prim.h, ...
 AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h])
@@ -1875,13 +1858,13 @@ AC_CHECK_HEADERS([ext2fs/ext2fs.h])
 
 SELINUX=""
 AC_CHECK_LIB([selinux], [is_selinux_enabled],
-       [AC_CHECK_HEADERS([selinux.h],
+       [AC_CHECK_HEADERS([selinux/selinux.h],
                        [SELINUX="-lselinux"
                        AC_DEFINE([HAVE_SELINUX], 1,
                                [support for selinux ])],
                        [AC_MSG_WARN([
 
-No selinux-devel package found, unable to build selinux enabled tools
+No libselinux-devel package found, unable to build selinux enabled tools
 ])
 ])],
        [AC_MSG_WARN([
@@ -1980,6 +1963,7 @@ lustre/include/lustre_ver.h
 lustre/include/linux/Makefile
 lustre/include/lustre/Makefile
 lustre/kernel_patches/targets/3.10-rhel7.target
+lustre/kernel_patches/targets/2.6-rhel6.6.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
@@ -2004,8 +1988,6 @@ lustre/lfsck/Makefile
 lustre/lfsck/autoMakefile
 lustre/mdt/Makefile
 lustre/mdt/autoMakefile
-lustre/nodemap/Makefile
-lustre/nodemap/autoMakefile
 lustre/mdd/Makefile
 lustre/mdd/autoMakefile
 lustre/fld/Makefile