#
-# LB_PATH_LDISKFS
+# LDISKFS_LINUX_SERIES
#
-# --without-ldiskfs - Disable ldiskfs support.
-# --with-ldiskfs=no
+AC_DEFUN([LDISKFS_LINUX_SERIES], [
+AC_MSG_CHECKING([which ldiskfs series to use])
+case x$LDISKFS_SERIES in
+ x) # not set
+ ;;
+ *.series) # set externally
+ ;;
+ *) LDISKFS_SERIES=
+esac
+AS_IF([test -z "$LDISKFS_SERIES"], [
+AS_IF([test x$RHEL_KERNEL = xyes], [
+ case $RHEL_RELEASE_NO in
+ 74) LDISKFS_SERIES="3.10-rhel7.4.series" ;;
+ 73) LDISKFS_SERIES="3.10-rhel7.3.series" ;;
+ 72) LDISKFS_SERIES="3.10-rhel7.2.series" ;;
+ 71) LDISKFS_SERIES="3.10-rhel7.series" ;;
+ 69) LDISKFS_SERIES="2.6-rhel6.9.series" ;;
+ 68) LDISKFS_SERIES="2.6-rhel6.8.series" ;;
+ 67) LDISKFS_SERIES="2.6-rhel6.7.series" ;;
+ 66) LDISKFS_SERIES="2.6-rhel6.6.series" ;;
+ 65) LDISKFS_SERIES="2.6-rhel6.5.series" ;;
+ 64) LDISKFS_SERIES="2.6-rhel6.4.series" ;;
+ 6[0-3]) LDISKFS_SERIES="2.6-rhel6.series" ;;
+ esac
+], [test x$SUSE_KERNEL = xyes], [
+ AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[
+ AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[
+ AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[
+ AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
+ AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32], [],
+ [LDISKFS_SERIES="2.6-sles11.series"],[LDISKFS_SERIES="2.6-sles11.series"])],
+ [LDISKFS_SERIES="3.0-sles11.series"],[
+ PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
+ case $PLEV in
+ 2) LDISKFS_SERIES="3.0-sles11.series"
+ ;;
+ 3) LDISKFS_SERIES="3.0-sles11sp3.series"
+ ;;
+ 4) LDISKFS_SERIES="3.0-sles11sp4.series"
+ ;;
+ esac
+ ])],[LDISKFS_SERIES="3.12-sles12.series"],[
+ PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
+ case $PLEV in
+ 1) LDISKFS_SERIES="3.12-sles12sp1.series"
+ ;;
+ *) LDISKFS_SERIES="3.12-sles12.series"
+ ;;
+ esac
+ ])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
+ [LDISKFS_SERIES="4.4-sles12sp2.series"]
+ )], [LDISKFS_SERIES="4.4-sles12sp3.series"],
+ [LDISKFS_SERIES="4.4-sles12sp3.series"])
+])
+])
+AS_IF([test -z "$LDISKFS_SERIES"],
+ [AC_MSG_RESULT([failed to identify series])],
+ [AC_MSG_RESULT([$LDISKFS_SERIES])])
+AC_SUBST(LDISKFS_SERIES)
+]) # LDISKFS_LINUX_SERIES
+
#
-# --with-ldiskfs - Enable ldiskfs support and attempt to autodetect the
-# --with-ldiskfs=yes headers in one of the following places in this order:
-# * ./ldiskfs
-# * /usr/src/ldiskfs-*/$LINUXRELEASE
-# * ../ldiskfs
+# LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
#
-# --with-ldiskfs=path - Enable ldiskfs support and use the headers in the
-# provided path. No autodetection is performed.
+# 2.6.32-rc7 ext4_free_blocks requires struct buffer_head
+# Note that RHEL6 is pre 2.6.32-rc7 so this check is still needed.
#
-# --with-ldiskfs-obj - When ldiskfs support is enabled the object directory
-# will be based on the --with-ldiskfs directory. If
-# this is detected incorrectly it can be explicitly
-# specified using this option.
+AC_DEFUN([LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD], [
+LB_CHECK_COMPILE([if 'ext4_free_blocks' needs 'struct buffer_head'],
+ext4_free_blocks_with_buffer_head, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+],[
+ ext4_free_blocks(NULL, NULL, NULL, 0, 0, 0);
+],[
+ AC_DEFINE(HAVE_EXT_FREE_BLOCK_WITH_BUFFER_HEAD, 1,
+ [ext4_free_blocks do not require struct buffer_head])
+])
+]) # LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
+
#
-# NOTE: As with all external packages ldiskfs is expected to already be
-# configured and built. However, if the ldiskfs tree is located in-tree
-# (./ldiskfs) then it will be configured and built recursively as part of
-# the lustre build system.
+# LB_EXT_PBLOCK
#
-# NOTE: The lustre and in-tree ldiskfs build systems both make use these
-# macros. This is undesirable and confusing at best, it is potentially
-# danagerous at worst. The ldiskfs build system should be entirely stand
-# alone without dependency on the lustre build system.
+# 2.6.35 renamed ext_pblock to ext4_ext_pblock(ex)
#
-AC_DEFUN([LB_PATH_LDISKFS],
-[
-AC_ARG_WITH([ldiskfs],
- AC_HELP_STRING([--with-ldiskfs=path], [set path to ldiskfs source]),
- [],[
- if test x$enable_server = xyes && test x$enable_dist = xno; then
- with_ldiskfs='yes'
- else
- with_ldiskfs='no'
- fi
- ])
+AC_DEFUN([LB_EXT_PBLOCK], [
+LB_CHECK_COMPILE([if Linux kernel has 'ext_pblock'],
+ext_pblock, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4_extents.h"
+],[
+ ext_pblock(NULL);
+],[
+ AC_DEFINE(HAVE_EXT_PBLOCK, 1, [Linux kernel has ext_pblock])
+])
+]) # LB_EXT_PBLOCK
-case x$with_ldiskfs in
- xno)
- LDISKFS_DIR=
- ;;
- xyes)
- LDISKFS_DIR=
+#
+# LB_EXT4_JOURNAL_START_3ARGS
+#
+# 3.9 added a type argument to ext4_journal_start and friends
+#
+AC_DEFUN([LB_EXT4_JOURNAL_START_3ARGS], [
+LB_CHECK_COMPILE([if ext4_journal_start takes 3 arguments],
+ext4_journal_start, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4_jbd2.h"
+],[
+ ext4_journal_start(NULL, 0, 0);
+],[
+ AC_DEFINE(JOURNAL_START_HAS_3ARGS, 1, [ext4_journal_start takes 3 arguments])
+])
+]) # LB_EXT4_JOURNAL_START_3ARGS
- # Check ./ldiskfs
- ldiskfs_src=$PWD/ldiskfs
- if test -e "$ldiskfs_src"; then
- LDISKFS_DIR=$(readlink -f $ldiskfs_src)
- else
- # Check /usr/src/ldiskfs-*/$LINUXRELEASE
- ldiskfs_src=$(ls -1d \
- /usr/src/ldiskfs-*/$LINUXRELEASE \
- 2>/dev/null | tail -1)
- if test -e "$ldiskfs_src"; then
- LDISKFS_DIR=$(readlink -f $ldiskfs_src)
- else
- # Check ../ldiskfs
- ldiskfs_src=$PWD/../ldiskfs
- if test -e "$ldiskfs_src"; then
- LDISKFS_DIR=$(readlink -f $ldiskfs_src)
- else
- # Disable ldiskfs failed to detect
- with_ldiskfs='no'
- fi
- fi
- fi
+#
+# LB_LDISKFS_MAP_BLOCKS
+#
+# Since 2.6.35 brought ext4_map_blocks() for IO.
+# We just check this function whether existed.
+# it must be exported by ldiskfs patches.
+#
+AC_DEFUN([LB_LDISKFS_MAP_BLOCKS], [
+LB_CHECK_COMPILE([if kernel has ext4_map_blocks],
+ext4_map_blocks, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+],[
+ ext4_map_blocks(NULL, NULL, NULL, 0);
+],[
+ AC_DEFINE(HAVE_LDISKFS_MAP_BLOCKS, 1, [kernel has ext4_map_blocks])
+])
+])
- ;;
- *)
- LDISKFS_DIR=$(readlink -f $with_ldiskfs)
- with_ldiskfs='yes'
- ;;
-esac
+#
+# LB_EXT4_BREAD_4ARGS
+#
+# 3.18 ext4_bread has 4 arguments
+#
+AC_DEFUN([LB_EXT4_BREAD_4ARGS], [
+LB_CHECK_COMPILE([if ext4_bread takes 4 arguments],
+ext4_bread, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+],[
+ ext4_bread(NULL, NULL, 0, 0);
+],[
+ AC_DEFINE(HAVE_EXT4_BREAD_4ARGS, 1, [ext4_bread takes 4 arguments])
+])
+]) # LB_EXT4_BREAD_4ARGS
-AC_MSG_CHECKING([whether to enable ldiskfs])
-AC_MSG_RESULT([$with_ldiskfs])
+#
+# LB_EXT4_HAVE_INFO_DQUOT
+#
+# in linux 4.4 i_dqout is in ext4_inode_info, not in struct inode
+#
+AC_DEFUN([LB_EXT4_HAVE_INFO_DQUOT], [
+LB_CHECK_COMPILE([if i_dquot is in ext4_inode_info],
+ext4_info_dquot, [
+ #include <linux/fs.h>
+ #include <linux/quota.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+],[
+ struct ext4_inode_info in;
+ struct dquot *dq;
+
+ dq = in.i_dquot[0];
+],[
+ AC_DEFINE(HAVE_EXT4_INFO_DQUOT, 1, [i_dquot is in ext4_inode_info])
+])
+]) # LB_EXT4_HAVE_INFO_DQUOT
-AC_ARG_WITH([ldiskfs-obj],
- AC_HELP_STRING([--with-ldiskfs-obj=path],[set path to ldiskfs objects]),
- [
- if test x$with_ldiskfs = xyes; then
- LDISKFS_OBJ="$withval"
- fi
- ],[
- if test x$with_ldiskfs = xyes; then
- LDISKFS_OBJ=$LDISKFS_DIR
- fi
+#
+# LDISKFS_AC_PATCH_PROGRAM
+#
+# Determine which program should be used to apply the patches to
+# the ext4 source code to produce the ldiskfs source code.
+#
+AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [
+ AC_ARG_ENABLE([quilt],
+ [AC_HELP_STRING([--disable-quilt],
+ [disable use of quilt for ldiskfs])],
+ [AS_IF([test "x$enableval" = xno],
+ [use_quilt=no],
+ [use_quilt=maybe])],
+ [use_quilt=maybe]
+ )
+
+ AS_IF([test x$use_quilt = xmaybe], [
+ AC_PATH_PROG([quilt_avail], [quilt], [no])
+ AS_IF([test x$quilt_avail = xno], [
+ use_quilt=no
+ ], [
+ use_quilt=yes
+ ])
])
-if test x$with_ldiskfs = xyes; then
- AC_MSG_CHECKING([ldiskfs source directory])
- AC_MSG_RESULT([$LDISKFS_DIR])
- AC_SUBST(LDISKFS_DIR)
-
- AC_MSG_CHECKING([ldiskfs object directory])
- AC_MSG_RESULT([$LDISKFS_OBJ])
- AC_SUBST(LDISKFS_OBJ)
-
- LB_LDISKFS_SYMVERS
- LB_LDISKFS_RELEASE
- LB_LDISKFS_EXT_DIR
- LB_LDISKFS_BUILD
- AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
-fi
+ AS_IF([test x$use_quilt = xno], [
+ AC_PATH_PROG([patch_avail], [patch], [no])
+ AS_IF([test x$patch_avail = xno], [
+ AC_MSG_ERROR([*** Need "quilt" or "patch" command])
+ ])
+ ])
+]) # LDISKFS_AC_PATCH_PROGRAM
#
-# LDISKFS_DEVEL is required because when using the ldiskfs-devel package the
-# ext4 source will be fully patched to ldiskfs. When building with the
-# in-tree ldiskfs this patching this will occur after the configure step.
-# We needed a way to determine if we should check the patched or unpatched
-# source files.
-#
-# Longer term this could be removed by moving the ldiskfs patching in to
-# the configure phase. Or better yet ldiskfs could be updated to generate
-# a ldiskfs_config.h which clearly defines how it was built. This can
-# then be directly included by Lustre to avoid all the autoconf guess work.
-# For an example of this behavior consult the lustre/zfs build integration.
-#
-AM_CONDITIONAL(LDISKFS_DEVEL, \
- test x$LDISKFS_DIR = x$(readlink -f $PWD/ldiskfs) || \
- test x$LDISKFS_DIR = x$(readlink -f $PWD/../ldiskfs))
+# LB_CONFIG_LDISKFS
+#
+AC_DEFUN([LB_CONFIG_LDISKFS], [
+# --with-ldiskfs is deprecated now that ldiskfs is fully merged with lustre.
+# However we continue to support this option through Lustre 2.5.
+AC_ARG_WITH([ldiskfs],
+ [],
+ [AC_MSG_WARN([--with-ldiskfs is deprecated, please use --enable-ldiskfs])
+ AS_IF([test x$withval != xyes -a x$withval != xno],
+ [AC_MSG_ERROR([
+
+The ldiskfs option is deprecated,
+and no longer supports paths to external ldiskfs source
+])])
+])
-AM_CONDITIONAL(LDISKFS_BUILD, test x$enable_ldiskfs_build = xyes)
-AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs = xyes)
+AC_ARG_ENABLE([ldiskfs],
+ [AS_HELP_STRING([--disable-ldiskfs],
+ [disable ldiskfs osd (default is enable)])],
+ [AS_IF([test x$enable_ldiskfs != xyes -a x$enable_ldiskfs != xno],
+ [AC_MSG_ERROR([ldiskfs valid options are "yes" or "no"])])],
+ [AS_IF([test "${with_ldiskfs+set}" = set],
+ [enable_ldiskfs=$with_ldiskfs],
+ [enable_ldiskfs=maybe])
+])
-if test -e "$PWD/ldiskfs"; then
- LDISKFS_DIST_SUBDIR="ldiskfs"
- AC_SUBST(LDISKFS_DIST_SUBDIR)
- AC_CONFIG_SUBDIRS("ldiskfs")
-fi
+AS_IF([test x$enable_server = xno],
+ [AS_CASE([$enable_ldiskfs],
+ [maybe], [enable_ldiskfs=no],
+ [yes], [AC_MSG_ERROR([cannot build ldiskfs when servers are disabled])]
+ )])
+
+AS_IF([test x$enable_ldiskfs != xno],[
+ # In the future, we chould change enable_ldiskfs from maybe to
+ # either yes or no based on additional tests, e.g. whether a patch
+ # set is available for the detected kernel. For now, we just always
+ # set it to "yes".
+ AS_IF([test x$enable_ldiskfs = xmaybe], [enable_ldiskfs=yes])
+
+ LDISKFS_LINUX_SERIES
+ LDISKFS_AC_PATCH_PROGRAM
+ LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
+ LB_EXT_PBLOCK
+ LB_EXT4_JOURNAL_START_3ARGS
+ LB_LDISKFS_MAP_BLOCKS
+ LB_EXT4_BREAD_4ARGS
+ LB_EXT4_HAVE_INFO_DQUOT
+ AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1, [enable encryption for ldiskfs])
+ AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
+ AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
])
-#
-# LB_LDISKFS_EXT_DIR
-#
-# Determine the location of the ext4 source code. It it required
-# for several configure tests and to build ldiskfs.
-#
-AC_DEFUN([LB_LDISKFS_EXT_DIR],
-[
-# Kernel ext source located with devel headers
-linux_src=$LINUX
-if test -e "$linux_src/fs/ext4/super.c"; then
- EXT_DIR=$linux_src/fs/ext4
-else
- # Kernel ext source provided by kernel-debuginfo-common package
- linux_src=$(ls -1d /usr/src/debug/*/linux-$LINUXRELEASE \
- 2>/dev/null | tail -1)
- if test -e "$linux_src/fs/ext4/super.c"; then
- EXT_DIR=$linux_src/fs/ext4
- else
- EXT_DIR=
- fi
-fi
+AC_MSG_CHECKING([whether to build ldiskfs])
+AC_MSG_RESULT([$enable_ldiskfs])
-AC_MSG_CHECKING([ext4 source directory])
-AC_MSG_RESULT([$EXT_DIR])
-AC_SUBST(EXT_DIR)
-])
+AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
+]) # LB_CONFIG_LDISKFS
#
-# LB_LDISKFS_EXT_SOURCE
+# LB_VALIDATE_EXT4_SRC_DIR
#
-# Spot check the existance of several source files common to ext4.
+# Spot check the existence of several source files common to ext4.
# Detecting this at configure time allows us to avoid a potential build
# failure and provide a useful error message to explain what is wrong.
#
-AC_DEFUN([LB_LDISKFS_EXT_SOURCE],
-[
-if test x$EXT_DIR = x; then
- enable_ldiskfs_build='no'
-else
- LB_CHECK_FILE([$EXT_DIR/dir.c], [], [
- enable_ldiskfs_build='no'
- AC_MSG_WARN([ext4 must exist for ldiskfs build])])
- LB_CHECK_FILE([$EXT_DIR/file.c], [], [
- enable_ldiskfs_build='no'
- AC_MSG_WARN([ext4 must exist for ldiskfs build])])
- LB_CHECK_FILE([$EXT_DIR/inode.c], [], [
- enable_ldiskfs_build='no'
- AC_MSG_WARN([ext4 must exist for ldiskfs build])])
- LB_CHECK_FILE([$EXT_DIR/super.c], [], [
- enable_ldiskfs_build='no'
- AC_MSG_WARN([ext4 must exist for ldiskfs build])])
-fi
+AC_DEFUN([LB_VALIDATE_EXT4_SRC_DIR], [
+enable_ldiskfs_build="no"
+AS_IF([test -n "$EXT4_SRC_DIR"], [
+ enable_ldiskfs_build="yes"
+ LB_CHECK_FILE([$EXT4_SRC_DIR/dir.c], [], [
+ enable_ldiskfs_build="no"
+ AC_MSG_WARN([ext4 must exist for ldiskfs build])
+ ])
+ LB_CHECK_FILE([$EXT4_SRC_DIR/file.c], [], [
+ enable_ldiskfs_build="no"
+ AC_MSG_WARN([ext4 must exist for ldiskfs build])
+ ])
+ LB_CHECK_FILE([$EXT4_SRC_DIR/inode.c], [], [
+ enable_ldiskfs_build="no"
+ AC_MSG_WARN([ext4 must exist for ldiskfs build])
+ ])
+ LB_CHECK_FILE([$EXT4_SRC_DIR/super.c], [], [
+ enable_ldiskfs_build="no"
+ AC_MSG_WARN([ext4 must exist for ldiskfs build])
+ ])
+])
-if test x$enable_ldiskfs_build = xno; then
- enable_server='no'
- enable_ldiskfs_build='no'
- with_ldiskfs='no'
- LDISKFS_SUBDIR=
+AS_IF([test "x$enable_ldiskfs_build" = xno], [
+ enable_ldiskfs="no"
AC_MSG_WARN([
-Disabling server because complete ext4 source does not exist.
+Disabling ldiskfs support because complete ext4 source does not exist.
If you are building using kernel-devel packages and require ldiskfs
server support then ensure that the matching kernel-debuginfo-common
and kernel-debuginfo-common-<arch> packages are installed.
-
])
-
-fi
])
+]) # LB_VALIDATE_EXT4_SRC_DIR
#
-# Optionally configure/make the ldiskfs sources. If the sources are
-# determined to reside in-tree this feature will automatically be
-# enabled. If the sources are not in-tree it will be disabled.
-# Use --enable-ldiskfs-build or --disable-ldiskfs-build if you need
-# to override this behavior.
-#
-AC_DEFUN([LB_LDISKFS_BUILD],
-[
-AC_ARG_ENABLE([ldiskfs-build],
- AC_HELP_STRING([--enable-ldiskfs-build],
- [enable ldiskfs configure/make]),
- [], [
- LDISKFS_DIR_INTREE=$(readlink -f $PWD/ldiskfs)
- if test x$LDISKFS_DIR = x$LDISKFS_DIR_INTREE; then
- enable_ldiskfs_build='yes'
- else
- enable_ldiskfs_build='no'
- fi
+# LB_EXT4_SRC_DIR
+#
+# Determine the location of the ext4 source code. It it required
+# for several configure tests and to build ldiskfs.
+#
+AC_DEFUN([LB_EXT4_SRC_DIR], [
+AC_MSG_CHECKING([ext4 source directory])
+# Kernel ext source located with devel headers
+linux_src=$LINUX
+AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+ EXT4_SRC_DIR="$linux_src/fs/ext4"
+], [
+ # Kernel ext source provided by kernel-debuginfo-common package
+ # that extracted to $LINUX
+ linux_src=$(ls -1d $linux_src/../../debug/*/linux-${LINUXRELEASE%.*}* \
+ 2>/dev/null | tail -1)
+ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+ EXT4_SRC_DIR="$linux_src/fs/ext4"
+ ], [
+ # Kernel ext source provided by kernel-debuginfo-common package
+ linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \
+ 2>/dev/null | tail -1)
+ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+ EXT4_SRC_DIR="$linux_src/fs/ext4"
+ ], [
+ EXT4_SRC_DIR=""
+ ])
])
-
-AC_MSG_CHECKING([whether to build ldiskfs])
-if test x$enable_ldiskfs_build = xyes; then
- AC_MSG_RESULT([$enable_ldiskfs_build])
- LDISKFS_SUBDIR="ldiskfs"
-
- LB_CHECK_FILE([$LDISKFS_DIR/configure], [], [
- AC_MSG_ERROR([Complete ldiskfs build system must exist])])
- LB_LDISKFS_EXT_SOURCE
-
- AC_SUBST(LDISKFS_SUBDIR)
-else
- enable_ldiskfs_build='no'
- AC_MSG_RESULT([$enable_ldiskfs_build])
-fi
-])
-
-AC_DEFUN([LB_LDISKFS_SYMVERS],
-[
-AC_MSG_CHECKING([ldiskfs module symbols])
-if test -r $LDISKFS_OBJ/Module.symvers; then
- LDISKFS_SYMBOLS=Module.symvers
-elif test -r $LDISKFS_OBJ/Modules.symvers; then
- LDISKFS_SYMBOLS=Modules.symvers
-elif test -r $LDISKFS_OBJ/ldiskfs/Module.symvers; then
- LDISKFS_SYMBOLS=Module.symvers
-elif test -r $LDISKFS_OBJ/ldiskfs/Modules.symvers; then
- LDISKFS_SYMBOLS=Modules.symvers
-else
- LDISKFS_SYMBOLS=$SYMVERFILE
-fi
-
-AC_MSG_RESULT([$LDISKFS_SYMBOLS])
-AC_SUBST(LDISKFS_SYMBOLS)
])
+AC_MSG_RESULT([$EXT4_SRC_DIR])
+AC_SUBST(EXT4_SRC_DIR)
-AC_DEFUN([LB_LDISKFS_RELEASE],
-[
-AC_MSG_CHECKING([ldiskfs source release])
-if test -r $LDISKFS_OBJ/config.h; then
- tmp_flags="$EXTRA_KCFLAGS"
- EXTRA_KCFLAGS="-I$LDISKFS_DIR $EXTRA_KCFLAGS"
- LB_LINUX_TRY_MAKE([
- #undef PACKAGE_NAME
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
- #undef PACKAGE_STRING
- #undef PACKAGE_BUGREPORT
- #undef PACKAGE
- #undef VERSION
- #undef STDC_HEADERS
-
- #include <$LDISKFS_OBJ/config.h>
- ],[
- char *LDISKFS_RELEASE;
- LDISKFS_RELEASE=VERSION;
- ],[
- $makerule LUSTRE_KERNEL_TEST=conftest.i
- ],[
- test -s build/conftest.i
- ],[
- eval $(grep "LDISKFS_RELEASE=" build/conftest.i)
- ],[
- AC_MSG_RESULT([unknown])
- AC_MSG_ERROR([Could not preprocess test program.])
- ])
- EXTRA_KCFLAGS="$tmp_flags"
- rm build/conftest.i
-elif test -r $LDISKFS_DIR/configure.ac; then
- LDISKFS_RELEASE=$(awk '/AC\_INIT/ { print [$]3 }' \
- $LDISKFS_DIR/configure.ac | tr ',' '\n')
-else
- AC_MSG_RESULT([unknown])
- AC_MSG_ERROR([Could not locate config.h, META, or configure.ac to check release.])
-fi
-
-if test x$LDISKFS_RELEASE = x; then
- AC_MSG_RESULT([unknown])
- AC_MSG_ERROR([Could not determine ldiskfs release.])
-fi
-
-AC_MSG_RESULT([$LDISKFS_RELEASE])
-AC_SUBST(LDISKFS_RELEASE)
-])
+LB_VALIDATE_EXT4_SRC_DIR
+]) # LB_EXT4_SRC_DIR
#
# LB_DEFINE_E2FSPROGS_NAMES
#
# Enable the use of alternate naming of ldiskfs-enabled e2fsprogs package.
#
-AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES],
-[
+AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES], [
+AC_MSG_CHECKING([whether to use alternate names for e2fsprogs])
AC_ARG_WITH([ldiskfsprogs],
- AC_HELP_STRING([--with-ldiskfsprogs],
- [use alternate names for ldiskfs-enabled e2fsprogs]),
- [],[withval='no'])
+ AC_HELP_STRING([--with-ldiskfsprogs],
+ [use alternate names for ldiskfs-enabled e2fsprogs]),
+ [], [withval="no"])
-AC_MSG_CHECKING([whether to use alternate names for e2fsprogs])
-if test x$withval = xyes ; then
+AS_IF([test "x$withval" = xyes], [
+ AC_MSG_RESULT([enabled])
AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
E2FSPROGS="ldiskfsprogs"
MKE2FS="mkfs.ldiskfs"
DUMPE2FS="dumpfs.ldiskfs"
E2FSCK="fsck.ldiskfs"
PFSCK="pfsck.ldiskfs"
- AC_MSG_RESULT([enabled])
-else
+], [
+ AC_MSG_RESULT([disabled])
E2FSPROGS="e2fsprogs"
MKE2FS="mke2fs"
DEBUGFS="debugfs"
DUMPE2FS="dumpe2fs"
E2FSCK="e2fsck"
PFSCK="fsck"
- 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_SUBST([DUMPE2FS], [$DUMPE2FS])
AC_SUBST([E2FSCK], [$E2FSCK])
AC_SUBST([PFSCK], [$PFSCK])
-])
+]) # LB_DEFINE_E2FSPROGS_NAMES