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 <minh.diep@intel.com>
Change-Id: I8b707dd66bcceb2b5b56a26ea7354c455c03f3d8
Reviewed-on: http://review.whamcloud.com/7692
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 23c1cc7..d990354 100644 (file)
--- 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
 
        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])
        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 (file)
--- 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}"], [
        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"
                        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 (file)
--- 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_PROG_LINUX
                        LIBCFS_PROG_LINUX
                        LN_PROG_LINUX

+                       LB_EXT4_SRC_DIR

                        LC_PROG_LINUX
                        ;;
                darwin*)
                        LC_PROG_LINUX
                        ;;
                darwin*)