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
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_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)
LB_CONFIG_MODULES
+LN_CONFIG_USERSPACE
+
LB_PATH_DMU
LB_PATH_LIBSYSIO
LB_PATH_SNMP