]) # LC_CONFIG_OBD_BUFFER_SIZE
#
-# LC_READLINK_SSIZE_T
-#
-AC_DEFUN([LC_READLINK_SSIZE_T], [
-AC_CACHE_CHECK([if readlink returns ssize_t],
-lb_cv_compile_readlink_ssize_t, [
-AC_TRY_COMPILE([
- #include <unistd.h>
-], [
- ssize_t readlink(const char *, char *, size_t);
-],
- [lb_cv_compile_readlink_ssize_t="yes"],
- [lb_cv_compile_readlink_ssize_t="no"])
-])
-AS_IF([test "x$lb_cv_compile_readlink_ssize_t" = xyes],
- [AC_DEFINE(HAVE_POSIX_1003_READLINK, 1,
- [readlink returns ssize_t])])
-]) # LC_READLINK_SSIZE_T
-
-#
# LC_GLIBC_SUPPORT_FHANDLES
#
AC_DEFUN([LC_GLIBC_SUPPORT_FHANDLES], [
]) # LC_CONFIG_CHECKSUM
#
-# LC_CONFIG_LIBLUSTRE_RECOVERY
-#
-AC_DEFUN([LC_CONFIG_LIBLUSTRE_RECOVERY], [
-AC_MSG_CHECKING([whether to enable liblustre recovery support])
-AC_ARG_ENABLE([liblustre-recovery],
- AC_HELP_STRING([--disable-liblustre-recovery],
- [disable liblustre recovery support]),
- [], [enable_liblustre_recovery="yes"])
-AC_MSG_RESULT([$enable_liblustre_recovery])
-AS_IF([test "x$enable_liblustre_recovery" != xno],
- [AC_DEFINE(ENABLE_LIBLUSTRE_RECOVERY, 1, [Liblustre Can Recover])])
-]) # LC_CONFIG_LIBLUSTRE_RECOVERY
-
-#
# LC_CONFIG_HEALTH_CHECK_WRITE
#
# Turn off the actual write to the disk
]) # LC_VFS_RENAME_5ARGS
#
+# LC_VFS_UNLINK_3ARGS
+#
+# 3.13 has vfs_renane with 3 args
+#
+AC_DEFUN([LC_VFS_UNLINK_3ARGS], [
+LB_CHECK_COMPILE([if Linux kernel has 'vfs_unlink' with 3 args],
+vfs_unlink_3args, [
+ #include <linux/fs.h>
+],[
+ vfs_unlink(NULL, NULL, NULL);
+], [
+ AC_DEFINE(HAVE_VFS_UNLINK_3ARGS, 1,
+ [kernel has vfs_unlink with 3 args])
+])
+]) # LC_VFS_UNLINK_3ARGS
+
+#
+# LC_HAVE_BVEC_ITER
+#
+# 3.14 move some of its data in struct bio into the new
+# struct bvec_iter
+#
+AC_DEFUN([LC_HAVE_BVEC_ITER], [
+LB_CHECK_COMPILE([if Linux kernel has struct bvec_iter],
+have_bvec_iter, [
+ #include <linux/bio.h>
+],[
+ struct bvec_iter iter;
+ iter.bi_bvec_done = 0;
+], [
+ AC_DEFINE(HAVE_BVEC_ITER, 1,
+ [kernel has struct bvec_iter])
+])
+]) # LC_HAVE_BVEC_ITER
+
+#
# LC_PROG_LINUX
#
# Lustre linux kernel checks
LC_CONFIG_PINGER
LC_CONFIG_CHECKSUM
- LC_CONFIG_LIBLUSTRE_RECOVERY
LC_CONFIG_HEALTH_CHECK_WRITE
LC_CONFIG_LRU_RESIZE
LC_LLITE_LLOOP_MODULE
# 3.13
LC_VFS_RENAME_5ARGS
+ LC_VFS_UNLINK_3ARGS
+
+ # 3.14
+ LC_HAVE_BVEC_ITER
#
AS_IF([test "x$enable_server" != xno], [
]) # LC_CONFIG_CLIENT
#
-# LC_CONFIG_LIBLUSTRE
-#
-# whether to build liblustre
-#
-AC_DEFUN([LC_CONFIG_LIBLUSTRE], [
-AC_MSG_CHECKING([whether to build Lustre library])
-AC_ARG_ENABLE([liblustre],
- AC_HELP_STRING([--enable-liblustre],
- [enable building of Lustre library]),
- [], [])
-AC_MSG_RESULT([$enable_liblustre])
-
-# only build sysio if liblustre is built
-with_sysio="$enable_liblustre"
-
-AC_MSG_CHECKING([whether to build liblustre tests])
-AC_ARG_ENABLE([liblustre-tests],
- AC_HELP_STRING([--enable-liblustre-tests],
- [enable liblustre tests, if --disable-tests is used]),
- [], [enable_liblustre_tests=$enable_tests])
-AS_IF([test "x$enable_liblustre" != xyes], [enable_liblustre_tests="no"])
-AC_MSG_RESULT([$enable_liblustre_tests])
-
-AC_MSG_CHECKING([whether to enable liblustre acl])
-AC_ARG_ENABLE([liblustre-acl],
- AC_HELP_STRING([--disable-liblustre-acl],
- [disable ACL support for liblustre]),
- [], [enable_liblustre_acl="yes"])
-AC_MSG_RESULT([$enable_liblustre_acl])
-
-AS_IF([test "x$enable_liblustre_acl" = xyes],
- [AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1,
- [Liblustre Support ACL-enabled MDS])])
-
-#
-# --enable-mpitest
-#
-AC_ARG_ENABLE(mpitests,
- AC_HELP_STRING([--enable-mpitests=yes|no|mpicc wrapper],
- [include mpi tests]),
- [
- enable_mpitests="yes"
- case $enableval in
- yes)
- MPICC_WRAPPER=mpicc
- ;;
- no)
- enable_mpitests=no
- ;;
- *)
- MPICC_WRAPPER=$enableval
- ;;
- esac
+# --enable-mpitests
+#
+AC_DEFUN([LB_CONFIG_MPITESTS], [
+AC_ARG_ENABLE([mpitests],
+ AC_HELP_STRING([--enable-mpitests=<yes|no|mpicc wrapper>],
+ [include mpi tests]), [
+ enable_mpitests="yes"
+ case $enableval in
+ yes)
+ MPICC_WRAPPER="mpicc"
+ ;;
+ no)
+ enable_mpitests="no"
+ ;;
+ *)
+ MPICC_WRAPPER=$enableval
+ ;;
+ esac
], [
- MPICC_WRAPPER=mpicc
- enable_mpitests=yes
+ enable_mpitests="yes"
+ MPICC_WRAPPER="mpicc"
])
-AS_IF([test "x$enable_mpitests" != xno], [
- oldcc=$CC
- CC=$MPICC_WRAPPER
- AC_MSG_CHECKING([whether mpitests can be built])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
+ if test "x$enable_mpitests" != "xno"; then
+ oldcc=$CC
+ CC=$MPICC_WRAPPER
+ AC_CACHE_CHECK([whether mpitests can be built],
+ lb_cv_mpi_tests, [AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <mpi.h>
- ]],[[
- int flag;
- MPI_Initialized(&flag);
- ]])
- ], [
- AC_MSG_RESULT([yes])
- ], [
- AC_MSG_RESULT([no])
- enable_mpitests=no
- ])
- CC=$oldcc
-])
-AC_SUBST(MPICC_WRAPPER)
-
-AC_MSG_NOTICE([Enabling Lustre configure options for libsysio])
-ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets"
-
-LC_CONFIG_PINGER
-LC_CONFIG_LIBLUSTRE_RECOVERY
-])
+ int main(void) {
+ int flag;
+ MPI_Initialized(&flag);
+ return 0;
+ }
+ ])], [lb_cv_mpi_tests="yes"], [lb_cv_mpi_tests="no"
+ enable_mpitests=$lb_cv_mpi_tests])
+ ])
+ CC=$oldcc
+ fi
+ AC_SUBST(MPICC_WRAPPER)
+]) # LB_CONFIG_MPITESTS
#
# LC_CONFIG_QUOTA
# maximum MDS thread count
LC_MDS_MAX_THREADS
-# include/liblustre.h
+# libcfs/include/libcfs/posix/libcfs.h
+# lustre/utils/llverdev.c
AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
-# liblustre/llite_lib.h
-AC_CHECK_HEADERS([xtio.h file.h])
-
-# liblustre/dir.c
+# libcfs/include/libcfs/linux/linux-prim.h, ...
AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h])
-# liblustre/lutil.c
-AC_CHECK_HEADERS([netinet/in.h arpa/inet.h catamount/data.h])
+# libcfs/libcfs/user-tcpip.c
+AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_FUNCS([inet_ntoa])
-# libsysio/src/readlink.c
-LC_READLINK_SSIZE_T
-
-# libcfs prng.c - depends on linux/types.h from liblustre/dir.c
+# libcfs/include/libcfs/linux/linux-prim.h
AC_CHECK_HEADERS([linux/random.h], [], [],
[#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
# utils/llverfs.c
AC_CHECK_HEADERS([ext2fs/ext2fs.h])
-# check for -lz support
-ZLIB=""
-AC_CHECK_LIB([z], [adler32],
- [AC_CHECK_HEADERS([zlib.h], [
- ZLIB="-lz"
- AC_DEFINE([HAVE_ADLER], 1,
- [support alder32 checksum type])
- ], [
- AC_MSG_WARN([
-
-No zlib-devel package found, unable to use adler32 checksum
-])
-])], [
- AC_MSG_WARN([
-
-No zlib package found, unable to use adler32 checksum
-])
-])
-AC_SUBST(ZLIB)
-
SELINUX=""
AC_CHECK_LIB([selinux], [is_selinux_enabled],
[AC_CHECK_HEADERS([selinux.h],
# AM_CONDITIONALS for lustre
#
AC_DEFUN([LC_CONDITIONALS], [
-AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes)
-AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes)
+AM_CONDITIONAL(LIBLUSTRE, false)
AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
AM_CONDITIONAL(CLIENT, test x$enable_client = xyes)
AM_CONDITIONAL(SERVER, test x$enable_server = xyes)
lustre/ldlm/Makefile
lustre/fid/Makefile
lustre/fid/autoMakefile
-lustre/liblustre/Makefile
-lustre/liblustre/tests/Makefile
-lustre/liblustre/tests/mpi/Makefile
lustre/llite/Makefile
lustre/llite/autoMakefile
lustre/lclient/Makefile
git://git.whamcloud.com / fs / lustre-release.git / blobdiff