])
#
+# LB_DOWNSTREAM_RELEASE
+#
+AC_DEFUN([LB_DOWNSTREAM_RELEASE],
+[AC_ARG_WITH([downstream-release],
+ AC_HELP_STRING([--with-downstream-release=string],
+ [set a string in the BUILD_VERSION and RPM Release: (default is nothing)]),
+ [DOWNSTREAM_RELEASE=$with_downstream_release],
+ [
+ # if not specified, see if it's in the META file
+ if test -f META; then
+ DOWNSTREAM_RELEASE=$(sed -ne '/^LOCAL_VERSION =/s/.*= *//p' META)
+ fi
+ ])
+AC_SUBST(DOWNSTREAM_RELEASE)
+])
+
+#
+# LB_BUILDID
+#
+# Check if the source is a GA release and if not, set a "BUILDID"
+#
+# Currently there are at least two ways/modes of/for doing this. One
+# is if we are in a valid git repository, the other is if we are in a
+# non-git source tree of some form. Building the latter from the former
+# will be handled here.
+AC_DEFUN([LB_BUILDID],
+[
+AC_MSG_CHECKING([for buildid])
+BUILDID=""
+if git branch >/dev/null 2>&1; then
+ ffw=0
+ hash=""
+ ver=$(git describe --match [[0-9v]]\* --tags)
+ if [[[ $ver = *-*-* ]]]; then
+ hash=${ver##*-}
+ ffw=${ver#*-}
+ ffw=${ffw%-*}
+ ver=${ver%%-*}
+ fi
+ # it's tempting to use [[ $ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$ ]]
+ # here but the portability of the regex on the right is dismal
+ # (thanx suse)
+ if echo "$ver" | egrep -q "^v([0-9]+_)+([0-9]+|RC[0-9]+)$"; then
+ ver=$(echo $ver | sed -e 's/^v\(.*\)/\1/' \
+ -e 's/_RC[[0-9]].*$//' -e 's/_/./g')
+ fi
+
+ # a "lustre fix" value of .0 should be truncated
+ if [[[ $ver = *.*.*.0 ]]]; then
+ ver=${ver%.0}
+ fi
+ # ditto for a "lustre fix" value of _0
+ if [[[ $ver = v*_*_*_0 ]]]; then
+ ver=${ver%_0}
+ fi
+
+
+ # only do this test for lustre (not ldiskfs)
+ if test "$PACKAGE" = "lustre" -a "$ver" != "$VERSION"; then
+ AC_MSG_ERROR([most recent tag found: $ver does not match current version $VERSION.])
+ fi
+
+ if test "$ffw" != "0"; then
+ BUILDID="$hash"
+ msg="$BUILDID (ahead by $ffw commits)"
+ AC_MSG_RESULT([$msg])
+ else
+ AC_MSG_RESULT([none... congratulations, you must be on a tag])
+ fi
+elif test -f META; then
+ BUILDID=$(sed -ne '/^BUILDID =/s/.*= *//p' META)
+ msg="$BUILDID (from META file)"
+ AC_MSG_RESULT([$msg])
+else
+ AC_MSG_WARN([FIXME: I don't know how to deal with source trees outside of git that don't have a META file. Not setting a buildid.])
+fi
+AC_SUBST(BUILDID)
+])
+
+#
# LB_CHECK_FILE
#
# Check for file existance even when cross compiling
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/fs/ldiskfs/inode.c],[],[
+ AC_MSG_ERROR([ldiskfs was not found in $LINUX/fs/ldiskfs/inode.c])
+ ])
+ ;;
*)
AC_MSG_RESULT([$with_ldiskfs])
- LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
+ LB_CHECK_FILE([$with_ldiskfs/ldiskfs/inode.c],[],[
AC_MSG_ERROR([A complete (built) external ldiskfs was not found.])
])
LDISKFS_DIR=$with_ldiskfs
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],
[
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])
])
#
[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
AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
E2FSPROGS="ldiskfsprogs"
MKE2FS="mkfs.ldiskfs"
- DEBUGFS="debug.ldiskfs"
- TUNE2FS="tune.ldiskfs"
+ DEBUGFS="debugfs.ldiskfs"
+ TUNE2FS="tunefs.ldiskfs"
E2LABEL="label.ldiskfs"
- DUMPE2FS="dump.ldiskfs"
+ DUMPE2FS="dumpfs.ldiskfs"
E2FSCK="fsck.ldiskfs"
AC_MSG_RESULT([enabled])
else
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/modules/spl/spl-generic.c],[],[
+ 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/zfs/lib/libzpool/dmu.c],[],[
+ 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(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)
])
])
#
+# LB_CONFIG_DIST
+#
+# Just enough configure so that "make dist" is useful
+#
+# this simply re-adjusts some defaults, which of course can be overridden
+# on the configure line after the --for-dist option
+#
+AC_DEFUN([LB_CONFIG_DIST],
+[AC_MSG_CHECKING([whether to configure just enough for make dist])
+AC_ARG_ENABLE([dist],
+ AC_HELP_STRING([--enable-dist],
+ [only configure enough for make dist]),
+ [enable_dist='yes'],[enable_dist='no'])
+AC_MSG_RESULT([$enable_dist])
+if test x$enable_dist != xno; then
+ enable_modules='no'
+ enable_utils='no'
+ enable_liblustre='no'
+ enable_doc='no'
+ enable_tests='no'
+fi
+])
+
+#
# LB_CONFIG_DOCS
#
# Build docs?
[skip creation of pdf documentation]),
[
if test x$enable_doc = xyes ; then
- ENABLE_DOC=1
+ ENABLE_DOC=1
else
ENABLE_DOC=0
fi
#
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)
AC_DEFUN([LB_CONFIGURE],
[LB_CANONICAL_SYSTEM
+LB_CONFIG_DIST
+
+LB_DOWNSTREAM_RELEASE
+LB_BUILDID
+
LB_LIBCFS_DIR
LB_INCLUDE_RULES
LB_CONFIG_TESTS
LC_CONFIG_CLIENT_SERVER
-# two macros for cmd3
+# two macros for cmd3
m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
LN_CONFIG_CDEBUG
LC_QUOTA
LB_CONFIG_MODULES
+LN_CONFIG_USERSPACE
+LB_HAVE_EXT4_ENABLED
LB_PATH_DMU
LB_PATH_LIBSYSIO
git://git.whamcloud.com / fs / lustre-release.git / blobdiff