Branch b1_8

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 9ba15bc..50a4236 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -45,19 +45,6 @@ AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
 AS_VAR_POPDEF([lb_File])dnl
 ])# LB_CHECK_FILE
 
-#
-# LB_CHECK_FILES
-#
-# LB_CHECK_FILE over multiple files
-#
-AC_DEFUN([LB_CHECK_FILES],
-[AC_FOREACH([AC_FILE_NAME], [$1],
-  [LB_CHECK_FILE(AC_FILE_NAME,
-                 [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1,
-                                    [Define to 1 if you have the
-                                     file `]AC_File['.])
-$2],
-                 [$3])])])
 
 #
 # LB_ARG_LIBS_INCLUDES
@@ -273,6 +260,9 @@ AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_XATTR, 1, [enable extented attributes for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1, [enable fs security for ldiskfs])
 ])
 
 #
@@ -521,12 +511,11 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        else
                # Kernel DMU
-               SPL_DIR="$PWD/spl"
-               ZFS_DIR="$PWD/zfs"
-               AC_SUBST(SPL_DIR)
-               AC_SUBST(ZFS_DIR)
+               SPL_SUBDIR="spl"
+               ZFS_SUBDIR="zfs"
 
-               AC_SUBST(spl_src)
+               SPL_DIR="$PWD/$SPL_SUBDIR"
+               ZFS_DIR="$PWD/$ZFS_SUBDIR"
 
                LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
                        AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])
@@ -541,6 +530,10 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(zfs)
        fi
 fi
+AC_SUBST(SPL_SUBDIR)
+AC_SUBST(ZFS_SUBDIR)
+AC_SUBST(SPL_DIR)
+AC_SUBST(ZFS_DIR)
 AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
 AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
 ])