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
# Handle internal/external lustre-iokit
#
AC_DEFUN([LB_PATH_LUSTREIOKIT],
-[AC_ARG_WITH([],
+[AC_ARG_WITH([lustre-iokit],
AC_HELP_STRING([--with-lustre-iokit=path],
[set path to lustre-iokit source (default is included lustre-iokit)]),
[],[
with_ldiskfs=no
fi
])
+AC_ARG_WITH([ldiskfs-inkernel],
+ AC_HELP_STRING([--with-ldiskfs-inkernel],
+ [use ldiskfs built in to the kernel]),
+ [with_ldiskfs=inkernel], [])
AC_MSG_CHECKING([location of ldiskfs])
case x$with_ldiskfs in
xyes)
xno)
AC_MSG_RESULT([disabled])
;;
+ xinkernel)
+ AC_MSG_RESULT([inkernel])
+ LB_CHECK_FILE([$LINUX/include/linux/ldiskfs_fs.h],[],[
+ AC_MSG_ERROR([ldiskfs was not found in $LINUX/include/linux/ldiskfs_fs.h])
+ ])
+ ;;
*)
AC_MSG_RESULT([$with_ldiskfs])
LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
AC_SUBST(LDISKFS_DIR)
AC_SUBST(LDISKFS_SUBDIR)
AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
+AM_CONDITIONAL(LDISKFS_IN_KERNEL, test x$with_ldiskfs = xinkernel)
+
+if test x$enable_ext4 = xyes ; then
+ AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [build ext4 based ldiskfs])
+fi
# We have to configure even if we don't build here for make dist to work
AC_CONFIG_SUBDIRS(ldiskfs)
])
+AC_DEFUN([LC_KERNEL_WITH_EXT4],
+[if test -f $LINUX/fs/ext4/ext4.h ; then
+$1
+else
+$2
+fi
+])
+
+#
+# LB_HAVE_EXT4_ENABLED
+#
+AC_DEFUN([LB_HAVE_EXT4_ENABLED],
+[
+if test x$RHEL_KERNEL = xyes; then
+ AC_ARG_ENABLE([ext4],
+ AC_HELP_STRING([--enable-ext4],
+ [enable building of ldiskfs based on ext4]),
+ [],
+ [
+ if test x$ldiskfs_is_ext4 = xyes; then
+ enable_ext4=yes
+ else
+ enable_ext4=no
+ fi
+ ])
+else
+ case $LINUXRELEASE in
+ # ext4 was in 2.6.22-2.6.26 but not stable enough to use
+ 2.6.2[[0-9]]*) enable_ext4='no' ;;
+ *) LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
+ [enable_ext4='no']) ;;
+ esac
+fi
+if test x$enable_ext4 = xyes; then
+ ac_configure_args="$ac_configure_args --enable-ext4"
+fi
+AC_MSG_CHECKING([whether to build ldiskfs based on ext4])
+AC_MSG_RESULT([$enable_ext4])
+])
+
# Define no libcfs by default.
AC_DEFUN([LB_LIBCFS_DIR],
[
])
#
-# LB_DEFINE_E2FSPROGS_NAMES
-#
-# Enable the use of alternate naming of ldiskfs-enabled e2fsprogs package.
-#
-AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES],
-[AC_ARG_WITH([ldiskfsprogs],
- AC_HELP_STRING([--with-ldiskfsprogs],
- [use alternate names for ldiskfs-enabled e2fsprogs]),
- [],[withval='no'])
-
-if test x$withval = xyes ; then
- AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
- E2FSPROGS="ldiskfsprogs"
- MKE2FS="mkfs.ldiskfs"
- DEBUGFS="debug.ldiskfs"
- TUNE2FS="tune.ldiskfs"
- E2LABEL="label.ldiskfs"
- DUMPE2FS="dump.ldiskfs"
- E2FSCK="fsck.ldiskfs"
- AC_MSG_RESULT([enabled])
-else
- E2FSPROGS="e2fsprogs"
- MKE2FS="mke2fs"
- DEBUGFS="debugfs"
- TUNE2FS="tune2fs"
- E2LABEL="e2label"
- DUMPE2FS="dumpe2fs"
- E2FSCK="e2fsck"
- AC_MSG_RESULT([disabled])
-fi
- AC_DEFINE_UNQUOTED(E2FSPROGS, "$E2FSPROGS", [name of ldiskfs e2fsprogs package])
- AC_DEFINE_UNQUOTED(MKE2FS, "$MKE2FS", [name of ldiskfs mkfs program])
- AC_DEFINE_UNQUOTED(DEBUGFS, "$DEBUGFS", [name of ldiskfs debug program])
- AC_DEFINE_UNQUOTED(TUNE2FS, "$TUNE2FS", [name of ldiskfs tune program])
- AC_DEFINE_UNQUOTED(E2LABEL, "$E2LABEL", [name of ldiskfs label program])
- AC_DEFINE_UNQUOTED(DUMPE2FS,"$DUMPE2FS", [name of ldiskfs dump program])
- AC_DEFINE_UNQUOTED(E2FSCK, "$E2FSCK", [name of ldiskfs fsck program])
-])
-
-#
# LB_CONFIG_CRAY_XT3
#
# Enable Cray XT3 features
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.])
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)
])
#
AC_DEFUN([LB_CONFIG_HEADERS],
[AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
+CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
AC_SUBST(EXTRA_KCFLAGS)
])
CC="$CC -m64"
fi
-CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
AC_SUBST(LLCPPFLAGS)
LC_QUOTA
LB_CONFIG_MODULES
+LN_CONFIG_USERSPACE
+LB_HAVE_EXT4_ENABLED
LB_PATH_DMU
LB_PATH_LIBSYSIO
LB_DEFINE_E2FSPROGS_NAMES
-LB_DEFINE_E2FSPROGS_NAMES
-
LC_CONFIG_LIBLUSTRE
LIBCFS_CONFIGURE
LN_CONFIGURE
git://git.whamcloud.com / fs / lustre-release.git / blobdiff