From 7ee34b627964031632d7757b7fab76fd79edff2f Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Tue, 17 Sep 2013 16:33:56 -0700 Subject: [PATCH 1/1] LU-3953 config: move ext4 src detection to earlier phase Moving ext4 src detection to earlier in config phase to make sure enable_ldiskfs is marked no to avoid build failure from client only. Correct syntax error in LB_ZFS_USER. Signed-off-by: Minh Diep Change-Id: I8b707dd66bcceb2b5b56a26ea7354c455c03f3d8 Reviewed-on: http://review.whamcloud.com/7692 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Andreas Dilger --- config/lustre-build-ldiskfs.m4 | 1 - config/lustre-build-zfs.m4 | 2 +- config/lustre-build.m4 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 23c1cc7..d990354 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -146,7 +146,6 @@ 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]) diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4 index f200d01..f4c46db 100644 --- a/config/lustre-build-zfs.m4 +++ b/config/lustre-build-zfs.m4 @@ -291,7 +291,7 @@ AC_DEFUN([LB_ZFS_USER], [ dnl # AC_MSG_CHECKING([zfs devel headers]) AS_IF([test -z "${zfslib}"], [ - AS_IF([test -e $zfssrc/include/libzfs.h && test -e $zfssrc/lib/libspl/include], [ + AS_IF([test -e "${zfssrc}/include/libzfs.h" && test -e "${zfssrc}/lib/libspl/include"], [ zfslib="-I $zfssrc/lib/libspl/include -I $zfssrc/include" ], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [ zfslib="-I /usr/include/libspl -I /usr/include/libzfs" diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 5b132e8..83395e1 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -301,6 +301,7 @@ if test x$enable_modules = xyes ; then LB_PROG_LINUX LIBCFS_PROG_LINUX LN_PROG_LINUX + LB_EXT4_SRC_DIR LC_PROG_LINUX ;; darwin*) -- 1.8.3.1