if git branch >/dev/null 2>&1; then
ffw=0
hash=""
- ver=$(git describe --match [[0-9v]]\* --tags)
+ ver=$(git describe --match v[[0-9]]_*_[[0-9]]* --tags)
if [[[ $ver = *-*-* ]]]; then
hash=${ver##*-}
ffw=${ver#*-}
# 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
+ 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
if [[[ $ver = v*_*_*_0 ]]]; then
ver=${ver%_0}
fi
-
+ if [[[ $ver = v*_*_* ]]]; then
+ ver=${ver#v}
+ ver=${ver//_/.}
+ 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.])
+ AC_MSG_WARN([most recent tag found: $ver does not match current version $VERSION.])
fi
if test "$ffw" != "0"; then
[AS_VAR_PUSHDEF([lb_File], [lb_cv_file_$1])dnl
AC_CACHE_CHECK([for $1], lb_File,
[if test -r "$1"; then
- AS_VAR_SET(lb_File, yes)
+ AS_VAR_SET(lb_File, yes)
else
- AS_VAR_SET(lb_File, no)
+ AS_VAR_SET(lb_File, no)
fi])
AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
AS_VAR_POPDEF([lb_File])dnl
AC_CONFIG_SUBDIRS(lustre-iokit)
])
-#
-# LB_PATH_LDISKFS
-#
-# Handle internal/external ldiskfs
-#
-AC_DEFUN([LB_PATH_LDISKFS],
-[AC_ARG_WITH([ldiskfs],
- AC_HELP_STRING([--with-ldiskfs=path],
- [set path to ldiskfs source (default is included ldiskfs)]),
- [],[
- if test x$linux25$enable_server = xyesyes ; then
- with_ldiskfs=yes
- else
- 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)
- AC_MSG_RESULT([internal])
- LB_CHECK_FILE([$srcdir/ldiskfs/lustre-ldiskfs.spec.in],[],[
- AC_MSG_ERROR([A complete internal ldiskfs was not found.])
- ])
- LDISKFS_SUBDIR="ldiskfs"
- LDISKFS_DIR="$PWD/ldiskfs"
- ;;
- 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])
- ])
- ;;
- *)
- AC_MSG_RESULT([$with_ldiskfs])
- LB_CHECK_FILE([$with_ldiskfs/ldiskfs/inode.c],[],[
- AC_MSG_ERROR([A complete (built) external ldiskfs was not found.])
- ])
- LDISKFS_DIR=$with_ldiskfs
- ;;
-esac
-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_LDISKFS_OPTIONS
-#
-# Enable config options related to ldiskfs. These are used both by ldiskfs
-# and lvfs (which includes ldiskfs headers.)
-#
-AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
-[
- AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module])
- 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'])
-
-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="debugfs.ldiskfs"
- TUNE2FS="tunefs.ldiskfs"
- E2LABEL="label.ldiskfs"
- DUMPE2FS="dumpfs.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_DEFUN([LB_CONFIG_CRAY_XT3],
-[AC_MSG_CHECKING([whether to build Cray XT3 features])
-AC_ARG_ENABLE([cray_xt3],
- AC_HELP_STRING([--enable-cray-xt3],
- [enable building of Cray XT3 features]),
- [enable_cray_xt3='yes'],[enable_cray_xt3='no'])
-AC_MSG_RESULT([$enable_cray_xt3])
-if test x$enable_cray_xt3 != xno; then
- AC_DEFINE(CRAY_XT3, 1, Enable Cray XT3 Features)
-fi
-])
-
-#
# LB_CONFIG_BGL
#
# Enable BGL features
])
#
-# Support for --enable-uoss
-#
-AC_DEFUN([LB_UOSS],
-[AC_MSG_CHECKING([whether to enable uoss])
-AC_ARG_ENABLE([uoss],
- AC_HELP_STRING([--enable-uoss],
- [enable userspace OSS]),
- [enable_uoss='yes'],[enable_uoss='no'])
-AC_MSG_RESULT([$enable_uoss])
-if test x$enable_uoss = xyes; then
- AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS)
- AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port)
- enable_uoss='yes'
- enable_ulevel_mt='yes'
- enable_modules='no'
- enable_client='no'
- enable_tests='no'
- enable_liblustre='no'
- with_ldiskfs='no'
-fi
-AC_SUBST(enable_uoss)
-])
-
-#
-# Support for --enable-posix-osd
-#
-AC_DEFUN([LB_POSIX_OSD],
-[AC_MSG_CHECKING([whether to enable posix osd])
-AC_ARG_ENABLE([posix-osd],
- AC_HELP_STRING([--enable-posix-osd],
- [enable using of posix osd]),
- [enable_posix_osd='yes'],[enable_posix_osd='no'])
-AC_MSG_RESULT([$enable_posix_osd])
-if test x$enable_uoss = xyes -a x$enable_posix_osd = xyes ; then
- AC_DEFINE(POSIX_OSD, 1, Enable POSIX OSD)
- posix_osd='yes'
-fi
-AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
-])
-
-#
-# LB_PATH_DMU
-#
-AC_DEFUN([LB_PATH_DMU],
-[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)
- 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(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_PATH_SNMP
#
# check for in-tree snmp support
#
# add -include config.h
#
-AC_DEFUN([LB_CONFIG_HEADERS],
-[AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
-AC_SUBST(EXTRA_KCFLAGS)
+AC_DEFUN([LB_CONFIG_HEADERS],[
+ AC_CONFIG_HEADERS([config.h])
+ CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
+ EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
+ AC_SUBST(EXTRA_KCFLAGS)
])
#
#
# defines for including the toplevel Rules
#
-AC_DEFUN([LB_INCLUDE_RULES],
-[INCLUDE_RULES="include $PWD/Rules"
-AC_SUBST(INCLUDE_RULES)
+AC_DEFUN([LB_INCLUDE_RULES],[
+ INCLUDE_RULES="include $PWD/Rules"
+ AC_SUBST(INCLUDE_RULES)
])
#
#
AC_DEFUN([LB_PROG_CC],
[AC_PROG_RANLIB
-AC_MSG_CHECKING([for buggy compiler])
-CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
-bad_cc() {
- AC_MSG_RESULT([buggy compiler found!])
- echo
- echo " '$CC_VERSION'"
- echo " has been known to generate bad code, "
- echo " please get an updated compiler."
- AC_MSG_ERROR([sorry])
-}
-case "$CC_VERSION" in
- "gcc version 2.95"*)
- bad_cc
- ;;
- # ost_pack_niobuf putting 64bit NTOH temporaries on the stack
- # without "sub $0xc,%esp" to protect the stack from being
- # stomped on by interrupts (bug 606)
- "gcc version 2.96 20000731 (Red Hat Linux 7.1 2.96-98)")
- bad_cc
- ;;
- # mandrake's similar sub 0xc compiler bug
- # http://marc.theaimsgroup.com/?l=linux-kernel&m=104748366226348&w=2
- "gcc version 2.96 20000731 (Mandrake Linux 8.1 2.96-0.62mdk)")
- bad_cc
- ;;
- *)
- AC_MSG_RESULT([no known problems])
- ;;
-esac
# --------- unsigned long long sane? -------
AC_CHECK_SIZEOF(unsigned long long, 0)
echo "---> size SIZEOF $SIZEOF_unsigned_long_long"
echo "---> size SIZEOF $ac_cv_sizeof_unsigned_long_long"
if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
- AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com])
+ AC_MSG_ERROR([** we assume that sizeof(long long) == 8.])
fi
if test $target_cpu == "powerpc64"; then
LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
AC_SUBST(LLCFLAGS)
+CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
+AC_SUBST(CCASFLAGS)
+
# everyone builds against lnet and lustre
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include"
AC_SUBST(EXTRA_KCFLAGS)
AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
-AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
+AM_CONDITIONAL(ARCH_x86, test x$target_cpu = "xx86_64" -o x$target_cpu = "xi686")
# this lets lustre cancel libsysio, per-branch or if liblustre is
# disabled
AC_SUBST(LIBSYSIO_SUBDIR)
AC_SUBST(SYSIO)
-LB_LINUX_CONDITIONALS
LB_DARWIN_CONDITIONALS
LIBCFS_CONDITIONALS
#
AC_DEFUN([LB_CONFIG_FILES],
[
-AC_CONFIG_FILES(
-[Makefile
-autoMakefile
-]
-[Rules:build/Rules.in]
-AC_PACKAGE_TARNAME[.spec]
-)
+ AC_CONFIG_FILES([
+ Makefile
+ autoMakefile]
+ [Rules:build/Rules.in]
+ AC_PACKAGE_TARNAME[.spec]
+ )
])
#
LB_INCLUDE_RULES
-LB_CONFIG_CRAY_XT3
LB_CONFIG_BGL
LB_PATH_DEFAULTS
LB_PROG_CC
-LB_UOSS
-LB_POSIX_OSD
+LC_OSD_ADDON
LB_CONFIG_DOCS
LB_CONFIG_UTILS
LB_CONFIG_MODULES
LN_CONFIG_USERSPACE
-LB_HAVE_EXT4_ENABLED
-LB_PATH_DMU
LB_PATH_LIBSYSIO
LB_PATH_SNMP
LB_PATH_LDISKFS
+LB_PATH_ZFS
LB_PATH_LUSTREIOKIT
LB_DEFINE_E2FSPROGS_NAMES
git://git.whamcloud.com / fs / lustre-release.git / blobdiff