LU-10810 ptlrpc: introduce OST_SEEK RPC

[fs/lustre-release.git] / config / lustre-build.m4

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index f196ef0..ad23218 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -103,19 +103,6 @@ AC_SUBST(LUSTREIOKIT_SUBDIR)
 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
 #
@@ -170,16 +157,32 @@ AC_MSG_RESULT([$enable_modules ($target_os)])
 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
 
 #
@@ -207,6 +210,18 @@ AC_ARG_ENABLE([tests],
        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
 
@@ -329,13 +344,14 @@ AS_IF([test $target_cpu = powerpc64], [
        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, lnetconfig headers, lustre/include for liblustreapi and friends
+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
 
@@ -423,6 +439,8 @@ AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = 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])
+AM_CONDITIONAL([LIBIBERTY_SUBDIR], [test -d /usr/include/libiberty])
 
 LN_CONDITIONALS
 LC_CONDITIONALS
@@ -551,6 +569,9 @@ fi
 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
@@ -573,6 +594,13 @@ elif test x$enable_gss = xno ; then
        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
@@ -588,6 +616,9 @@ 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
 
@@ -609,8 +640,6 @@ LB_CONFIG_DIST
 LB_DOWNSTREAM_RELEASE
 LB_USES_DPKG
 
-LB_LIBCFS_DIR
-
 LB_INCLUDE_RULES
 
 LB_PATH_DEFAULTS
@@ -629,10 +658,15 @@ LB_CONFIG_TESTS
 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_tests" = xyes], [
+       LC_HAVE_LIBAIO
+])
+
 LIBCFS_CONFIG_CDEBUG
 LC_QUOTA