LU-3953 build: configure output improvments

[fs/lustre-release.git] / config / lustre-build-ldiskfs.m4

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 23c1cc7..e06527e 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -5,10 +5,12 @@ AC_MSG_CHECKING([which ldiskfs series to use])
 
 SER=
 AS_IF([test x$RHEL_KERNEL = xyes], [
+       AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-431],[
        AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-343],[
        AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32],[],
        [SER="2.6-rhel6.series"],[SER="2.6-rhel6.series"])],
-       [SER="2.6-rhel6.4.series"],[SER="2.6-rhel6.4.series"])
+       [SER="2.6-rhel6.4.series"],[SER="2.6-rhel6.4.series"])],
+       [SER="2.6-rhel6.5.series"],[SER="2.6-rhel6.5.series"])
 ], [test x$SUSE_KERNEL = xyes], [
        AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[],
@@ -114,8 +116,11 @@ AC_ARG_WITH([ldiskfs],
        [],
        [AC_MSG_WARN([--with-ldiskfs is deprecated, please use --enable-ldiskfs])
        AS_IF([test x$withval != xyes -a x$withval != xno],
-               [AC_MSG_ERROR([the ldiskfs option is deprecated, and
-                       no longer supports paths to external ldiskfs source])])
+               [AC_MSG_ERROR([
+
+The ldiskfs option is deprecated,
+and no longer supports paths to external ldiskfs source
+])])
        ]
 )
 
@@ -146,12 +151,12 @@ AS_IF([test x$enable_ldiskfs != xno],[
 
        LDISKFS_LINUX_SERIES
        LDISKFS_AC_PATCH_PROGRAM
-       LB_EXT4_SRC_DIR
        LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
        LB_EXT_PBLOCK
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs])
        AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
        AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 ])
@@ -198,7 +203,6 @@ Disabling ldiskfs support because complete ext4 source does not exist.
 If you are building using kernel-devel packages and require ldiskfs
 server support then ensure that the matching kernel-debuginfo-common
 and kernel-debuginfo-common-<arch> packages are installed.
-
 ])
 
 fi