AM_CONDITIONAL([BUILD_LUSTREIOKIT], [test "x$enable_iokit" = xyes])
]) # LB_PATH_LUSTREIOKIT
-# Define no libcfs by default.
-AC_DEFUN([LB_LIBCFS_DIR], [
-AS_IF([test "x$libcfs_is_module" = xyes], [
- LIBCFS_INCLUDE_DIR="libcfs/include"
- LIBCFS_SUBDIR="libcfs"
- ], [
- LIBCFS_INCLUDE_DIR="lnet/include"
- LIBCFS_SUBDIR=""
- ])
-AC_SUBST(LIBCFS_INCLUDE_DIR)
-AC_SUBST(LIBCFS_SUBDIR)
-]) # LB_LIBCFS_DIR
-
#
# LB_LIBMOUNT
#
AC_ARG_ENABLE([modules],
AC_HELP_STRING([--disable-modules],
[disable building of Lustre kernel modules]),
- [], [
+ [ AC_DEFINE(HAVE_NATIVE_LINUX_CLIENT, 1, [support native Linux client])], [
LC_TARGET_SUPPORTED([enable_modules="yes"],
[enable_modules="no"])
])
AS_IF([test "x$enable_modules" = xyes], [
AS_CASE([$target_os],
[linux*], [
+ # Run serial tests
LB_PROG_LINUX
LIBCFS_PROG_LINUX
LN_PROG_LINUX
AS_IF([test "x$enable_server" != xno], [LB_EXT4_SRC_DIR])
LC_PROG_LINUX
+
+ # Run any parallel compile tests
+ LIBCFS_PROG_LINUX_SRC
+ LN_PROG_LINUX_SRC
+ AS_IF([test "x$enable_server" != xno], [LB_EXT4_SRC_DIR_SRC])
+ LC_PROG_LINUX_SRC
+
+ # Collect parallel compile tests results
+ LIBCFS_PROG_LINUX_RESULTS
+ LN_PROG_LINUX_RESULTS
+ AS_IF([test "x$enable_server" != xno], [LB_EXT4_SRC_DIR_RESULTS])
+ LC_PROG_LINUX_RESULTS
+
], [*], [
# This is strange - Lustre supports a target we don't
AC_MSG_ERROR([Modules are not supported on $target_os])
- ])
])
+ # Use OpenSFS UAPI header path instead of linux kernel
+ CPPFLAGS="-I$PWD/lnet/include/uapi -I$PWD/lustre/include/uapi $CPPFLAGS"
+])
]) # LB_CONFIG_MODULES
#
AC_HELP_STRING([--disable-tests],
[disable building of Lustre tests]),
[], [enable_tests="yes"])
+
+#
+# Check to see if we can build the lutf
+#
+AX_PYTHON_DEVEL()
+AS_IF([test "x$PYTHON_VERSION_CHECK" = xno], [
+ enable_lutf="no"
+], [
+ AX_PKG_SWIG(2.0, [ enable_lutf="yes" ],
+ [ enable_lutf="no" ])
+])
+
AC_MSG_RESULT([$enable_tests])
]) # LB_CONFIG_TESTS
CC="$CC -m64"
])
-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lnet/include/uapi -I$PWD/lustre/include -I$PWD/lustre/include/uapi $CPPFLAGS"
+# libcfs/include for util headers, lustre/include for liblustreapi and friends
+# UAPI headers from OpenSFS are included if modules support is enabled, otherwise
+# it will use the native kernel implementation.
+CPPFLAGS="-I$PWD/libcfs/include -I$PWD/lnet/utils/ -I$PWD/lustre/include $CPPFLAGS"
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"
+# everyone builds against lnet and lustre kernel headers
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/libcfs/include -I$PWD/libcfs/include/libcfs -I$PWD/lnet/include/uapi -I$PWD/lnet/include -I$PWD/lustre/include/uapi -I$PWD/lustre/include"
AC_SUBST(EXTRA_KCFLAGS)
]) # LB_PROG_CC
AC_MSG_CHECKING([for -Wno-stringop-truncation support])
saved_flags="$CFLAGS"
- CFLAGS="$CFLAGS -Wno-stringop-truncation"
+ CFLAGS="$CFLAGS -Werror -Wno-stringop-truncation"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-stringop-truncation"
AM_CONDITIONAL([MANPAGES], [test x$enable_manpages = xyes])
AM_CONDITIONAL([LINUX], [test x$lb_target_os = xlinux])
AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes])
-AM_CONDITIONAL([RHEL], [test x$RHEL_KERNEL = xyes])
-AM_CONDITIONAL([SUSE], [test x$SUSE_KERNEL = xyes])
+AM_CONDITIONAL([RHEL], [test -f /etc/redhat-release])
+AM_CONDITIONAL([SUSE], [test -f /etc/SUSE-brand -o -f /etc/SuSE-release])
AM_CONDITIONAL([UBUNTU], [test x$UBUNTU_KERNEL = xyes])
+AM_CONDITIONAL([BUILD_LUTF], [test x$enable_lutf = xyes])
-# Sanity check for PCLMULQDQ instruction availability
-# PCLMULQDQ instruction is a new instruction available beginning with
-# the all new Core processor family based on the 32nm microarchitecture
-# codename Westmere. So, $target_cpu = x86_64 should have this instruction
-# except MIC microarchitecture (k1om).
-AM_CONDITIONAL(HAVE_PCLMULQDQ, test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om")
-AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"],
- [AC_DEFINE(HAVE_PCLMULQDQ, 1, [have PCLMULQDQ instruction])])
-
-LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
]) # LB_CONDITIONALS
AC_PACKAGE_TARNAME[-dkms.spec]
ldiskfs/Makefile
ldiskfs/autoMakefile
+ lustre/utils/lustre.pc
lustre-iokit/Makefile
lustre-iokit/obdfilter-survey/Makefile
lustre-iokit/ost-survey/Makefile
if test x$enable_tests != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_tests"
fi
+if test x$enable_lutf != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without lustre_tests_lutf"
+fi
if test x$enable_utils != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_utils"
fi
RPMBINARGS="$RPMBINARGS --without gss"
AC_SUBST(ENABLE_GSS, no)
fi
+if test x$enable_crypto = xyes ; then
+ RPMBINARGS="$RPMBINARGS --with crypto"
+ AC_SUBST(ENABLE_CRYPTO, yes)
+elif test x$enable_crypto = xno ; then
+ RPMBINARGS="$RPMBINARGS --without crypto"
+ AC_SUBST(ENABLE_CRYPTO, no)
+fi
if test x$enable_iokit != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_iokit"
fi
if test x$enable_static != xyes ; then
RPMBINARGS="$RPMBINARGS --without static"
fi
+if test x$enable_mpitests != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without mpi"
+fi
RPMBUILD_BINARY_ARGS=$RPMBINARGS
]) # LB_CONFIG_RPMBUILD_OPTIONS
#
+# LB_CONFIG_CACHE_OPTIONS
+#
+# Propagate config cache option
+#
+AC_DEFUN([LB_CONFIG_CACHE_OPTIONS], [
+CONFIG_CACHE_FILE=
+if test -f "$cache_file"; then
+ CONFIG_CACHE_FILE=$(readlink --canonicalize "$cache_file")
+fi
+AC_SUBST(CONFIG_CACHE_FILE)
+]) # LB_CONFIG_CACHE_OPTIONS
+
+#
# LB_CONFIGURE
#
# main configure steps
LB_DOWNSTREAM_RELEASE
LB_USES_DPKG
-LB_LIBCFS_DIR
-
LB_INCLUDE_RULES
LB_PATH_DEFAULTS
LC_CONFIG_CLIENT
LB_CONFIG_MPITESTS
LB_CONFIG_SERVERS
+LC_CONFIG_CRYPTO
# Tests depends from utils (multiop from liblustreapi)
AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
+AS_IF([test "x$enable_utils" = xyes], [
+ LC_GLIBC_SUPPORT_COPY_FILE_RANGE
+ LC_OPENSSL_SSK
+ LC_OPENSSL_GETSEPOL
+ LC_FID2PATH_ANON_UNION
+ LC_IOC_REMOVE_ENTRY
+])
+AS_IF([test "x$enable_tests" = xyes], [
+ LC_HAVE_LIBAIO
+ LC_GLIBC_SUPPORT_FHANDLES
+])
+
LIBCFS_CONFIG_CDEBUG
LC_QUOTA
AC_SUBST(MOSTLYCLEANFILES)
LB_CONFIG_RPMBUILD_OPTIONS
+LB_CONFIG_CACHE_OPTIONS
AC_OUTPUT
git://git.whamcloud.com / fs / lustre-release.git / blobdiff