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
])
#
+# LB_PATH_LUSTREIOKIT
+#
+# Handle internal/external lustre-iokit
+#
+AC_DEFUN([LB_PATH_LUSTREIOKIT],
+[AC_ARG_WITH([],
+ AC_HELP_STRING([--with-lustre-iokit=path],
+ [set path to lustre-iokit source (default is included lustre-iokit)]),
+ [],[
+ with_lustre_iokit='yes'
+ ])
+AC_MSG_CHECKING([location of lustre-iokit])
+enable_lustre_iokit="$with_lustre_iokit"
+case x$with_lustre_iokit in
+ xyes)
+ AC_MSG_RESULT([internal])
+ LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
+ AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
+ ])
+ LUSTREIOKIT_SUBDIR="lustre-iokit"
+ LUSTREIOKIT="$PWD/lustre-iokit"
+ ;;
+ xno)
+ AC_MSG_RESULT([disabled])
+ ;;
+ *)
+ AC_MSG_RESULT([$with_lustre_iokit])
+ LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
+ AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
+ ])
+ LUSTREIOKIT="$with_lustre_iokit"
+ with_lustre_iokit="yes"
+ ;;
+esac
+AC_SUBST(LUSTREIOKIT_SUBDIR)
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(lustre-iokit)
+])
+
+#
# LB_PATH_LDISKFS
#
# Handle internal/external ldiskfs
AC_SUBST(LDISKFS_SUBDIR)
AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
+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)
])
+# Define no libcfs by default.
+AC_DEFUN([LB_LIBCFS_DIR],
+[
+case x$libcfs_is_module in
+ xyes)
+ LIBCFS_INCLUDE_DIR="libcfs/include"
+ LIBCFS_SUBDIR="libcfs"
+ ;;
+ x*)
+ LIBCFS_INCLUDE_DIR="lnet/include"
+ LIBCFS_SUBDIR=""
+ ;;
+esac
+AC_SUBST(LIBCFS_SUBDIR)
+AC_SUBST(LIBCFS_INCLUDE_DIR)
+])
+
#
# LB_DEFINE_LDISKFS_OPTIONS
#
AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFSDEV_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFSDEV_FS_XATTR, 1, [enable extented attributes for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1, [enable fs security for ldiskfs])
+])
+
+#
+# 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_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_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])
])
#
[enable_bgl='yes'],[enable_bgl='no'])
AC_MSG_RESULT([$enable_bgl])
if test x$enable_bgl != xno; then
- AC_DEFINE(BGL_SUPPORT, 1, Enable BGL Features)
+ AC_DEFINE(HAVE_BGL_SUPPORT, 1, Enable BGL Features)
enable_doc='no'
enable_tests='no'
enable_server='no'
#
# LB_PATH_DMU
-# Support for --with-dmu
#
AC_DEFUN([LB_PATH_DMU],
-[AC_MSG_CHECKING([whether to enable DMU])
-AC_ARG_WITH([dmu],
- AC_HELP_STRING([--with-dmu=path],
- [set path to a DMU tree (default is included zfs-lustre)]),
- [
- DMU_SRC=$with_dmu
- ],
- [
- DMU_SRC="$PWD/zfs-lustre"
- ])
-if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then
+[AC_ARG_ENABLE([dmu],
+ AC_HELP_STRING([--enable-dmu],
+ [enable the DMU backend]),
+ [],[with_dmu='default'])
+AC_MSG_CHECKING([whether to enable DMU])
+case x$with_dmu in
+ xyes)
+ dmu_osd='yes'
+ ;;
+ xno)
+ dmu_osd='no'
+ ;;
+ xdefault)
+ if test x$enable_uoss = xyes -a x$posix_osd != xyes; then
+ # Enable the DMU if we're configuring a userspace server
+ dmu_osd='yes'
+ else
+ # Enable the DMU by default on the b_hd_kdmu branch
+ if test -d $PWD/zfs -a x$linux25$enable_server = xyesyes; then
+ dmu_osd='yes'
+ else
+ dmu_osd='no'
+ fi
+ fi
+ ;;
+ *)
+ dmu_osd='yes'
+ ;;
+esac
+AC_MSG_RESULT([$dmu_osd])
+if test x$dmu_osd = xyes; then
AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
- AC_MSG_RESULT([yes])
- LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
- AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
- ])
- AC_CONFIG_SUBDIRS(zfs-lustre)
- dmu_osd='yes'
-else
- AC_MSG_RESULT([no])
+ if test x$enable_uoss = xyes; then
+ # Userspace DMU
+ DMU_SRC="$PWD/lustre/zfs-lustre"
+ AC_SUBST(DMU_SRC)
+ LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
+ AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
+ ])
+ AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
+ else
+ # Kernel DMU
+ SPL_SUBDIR="spl"
+ ZFS_SUBDIR="zfs"
+
+ 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.])
+ ])
+
+ LB_CHECK_FILE([$ZFS_DIR/module/zfs/dmu.c],[],[
+ AC_MSG_ERROR([A complete kernel DMU tree was not found in $ZFS_DIR.])
+ ])
+
+ AC_CONFIG_SUBDIRS(spl)
+ ac_configure_args="$ac_configure_args --with-spl=$SPL_DIR"
+ AC_CONFIG_SUBDIRS(zfs)
+ fi
fi
-AC_SUBST(DMU_SRC)
+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)
])
#
case $target_os in
linux*)
LB_PROG_LINUX
+ LIBCFS_PROG_LINUX
LN_PROG_LINUX
LC_PROG_LINUX
;;
darwin*)
LB_PROG_DARWIN
+ LIBCFS_PROG_DARWIN
;;
*)
# This is strange - Lustre supports a target we don't
docdir='${datadir}/doc/$(PACKAGE)'
AC_SUBST(docdir)
+LIBCFS_PATH_DEFAULTS
LN_PATH_DEFAULTS
LC_PATH_DEFAULTS
AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com])
fi
-# FIXME
-AC_CHECK_DECL([__i386__], [], [
-
-if test x$enable_bgl != xyes; then
-AC_MSG_CHECKING([if $CC accepts -m64])
-CC_save="$CC"
-CC="$CC -m64"
-AC_TRY_COMPILE([],[],[
- AC_MSG_RESULT([yes])
-],[
- AC_MSG_RESULT([no])
- CC="$CC_save"
-])
+if test $target_cpu == "powerpc64"; then
+ AC_MSG_WARN([set compiler with -m64])
+ CFLAGS="$CFLAGS -m64"
+ CC="$CC -m64"
fi
-])
-
-CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+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"
LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
AC_SUBST(LLCPPFLAGS)
-LLCFLAGS="-g -Wall -fPIC"
+# Add _GNU_SOURCE for strnlen on linux
+LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
AC_SUBST(LLCFLAGS)
# everyone builds against lnet and lustre
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include"
AC_SUBST(EXTRA_KCFLAGS)
])
LB_LINUX_CONDITIONALS
LB_DARWIN_CONDITIONALS
+LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
])
AC_DEFUN([LB_CONFIGURE],
[LB_CANONICAL_SYSTEM
+LB_LIBCFS_DIR
+
LB_INCLUDE_RULES
LB_CONFIG_CRAY_XT3
LB_UOSS
LB_POSIX_OSD
-LB_PATH_DMU
LB_CONFIG_DOCS
LB_CONFIG_UTILS
LB_CONFIG_TESTS
LC_CONFIG_CLIENT_SERVER
-# three macros for cmd3
-LC_CONFIG_SPLIT
-LC_CONFIG_LDISKFS
+# two macros for cmd3
+m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
LN_CONFIG_CDEBUG
+LC_QUOTA
LB_CONFIG_MODULES
+LN_CONFIG_USERSPACE
+
+LB_PATH_DMU
LB_PATH_LIBSYSIO
LB_PATH_SNMP
LB_PATH_LDISKFS
+LB_PATH_LUSTREIOKIT
+
+LB_DEFINE_E2FSPROGS_NAMES
+
+LB_DEFINE_E2FSPROGS_NAMES
+
+LB_DEFINE_E2FSPROGS_NAMES
LC_CONFIG_LIBLUSTRE
+LIBCFS_CONFIGURE
LN_CONFIGURE
LC_CONFIGURE
LS_CONFIGURE
fi
+
LB_CONDITIONALS
LB_CONFIG_HEADERS
+LIBCFS_CONFIG_FILES
LB_CONFIG_FILES
LN_CONFIG_FILES
LC_CONFIG_FILES
git://git.whamcloud.com / fs / lustre-release.git / blobdiff