LU-5600 kernel: kernel update RHEL6.5 [2.6.32-431.29.2.el6]

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

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 864a653..32b3861 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -18,12 +18,6 @@ case $target_os in
        linux*)
                lb_target_os="linux"
                ;;
-       darwin*)
-               lb_target_os="darwin"
-               ;;
-       solaris*)
-               lb_target_os="SunOS"
-               ;;
 esac
 AC_SUBST(lb_target_os)
 ]) # LB_CANONICAL_SYSTEM
@@ -173,44 +167,6 @@ AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [
 ]) # LB_ARG_LIBS_INCLUDES
 
 #
-# LB_PATH_LIBSYSIO
-#
-# Handle internal/external libsysio
-#
-AC_DEFUN([LB_PATH_LIBSYSIO], [
-AC_MSG_CHECKING([location of libsysio])
-AC_ARG_WITH([sysio],
-       AC_HELP_STRING([--with-sysio=path],
-               [set path to libsysio source (default is included libsysio)]),
-       [], [
-               AS_IF([test "x$lb_target_os" = xlinux],
-                       [with_sysio="yes"],
-                       [with_sysio="no"])
-       ])
-AS_IF([test "x$with_sysio" = xyes], [
-               AC_MSG_RESULT([internal])
-               LB_CHECK_FILE([$srcdir/libsysio/src/rmdir.c], [], [
-                       AC_MSG_ERROR([A complete internal libsysio was not found.])
-               ])
-               LIBSYSIO_SUBDIR="libsysio"
-               SYSIO="$PWD/libsysio"
-       ], [test "x$with_sysio" = xno], [
-               AC_MSG_RESULT([disabled])
-       ], [
-               AC_MSG_RESULT([$with_sysio])
-               LB_CHECK_FILE([$with_sysio/lib/libsysio.a], [], [
-                       AC_MSG_ERROR([A complete (built) external libsysio was not found.])
-               ])
-               LIBSYSIO_SUBDIR=""
-               SYSIO=$with_sysio
-               with_sysio="yes"
-       ])
-enable_sysio=$with_sysio
-# We have to configure even if we don't build here for make dist to work
-AC_CONFIG_SUBDIRS([libsysio])
-]) # LB_PATH_LIBSYSIO
-
-#
 # LB_PATH_LUSTREIOKIT
 #
 # We no longer handle external lustre-iokit
@@ -277,9 +233,6 @@ AS_IF([test "x$enable_modules" = xyes], [
                        LN_PROG_LINUX
                        AS_IF([test "x$enable_server" != xno], [LB_EXT4_SRC_DIR])
                        LC_PROG_LINUX
-               ], [darwin*], [
-                       LB_PROG_DARWIN
-                       LIBCFS_PROG_DARWIN
                ], [*], [
                        # This is strange - Lustre supports a target we don't
                        AC_MSG_ERROR([Modules are not supported on $target_os])
@@ -336,7 +289,6 @@ AS_IF([test "x$enable_dist" != xno], [
        enable_utils="no"
        enable_tests="no"
        enable_modules="no"
-       enable_liblustre="no"
 ])
 ]) # LB_CONFIG_DIST
 
@@ -472,8 +424,6 @@ AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes])
 AM_CONDITIONAL([DOC], [test x$ENABLE_DOC = x1])
 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([SUNOS], [test x$lb_target_os = xSunOS])
 AM_CONDITIONAL([USES_DPKG], [test x$uses_dpkg = xyes])
 AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes])
 
@@ -486,19 +436,6 @@ AM_CONDITIONAL(HAVE_PCLMULQDQ, test x$target_cpu = "xx86_64" -a x$target_vendor
 AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"],
        [AC_DEFINE(HAVE_PCLMULQDQ, 1, [have PCLMULQDQ instruction])])
 
-# this lets lustre cancel libsysio, per-branch or if liblustre is
-# disabled
-AS_IF([test "x$LIBSYSIO_SUBDIR" = xlibsysio], [
-       AS_IF([test "x$with_sysio" != xyes], [
-               SYSIO=""
-               LIBSYSIO_SUBDIR=""
-       ])
-])
-AC_SUBST(LIBSYSIO_SUBDIR)
-AC_SUBST(SYSIO)
-
-LB_DARWIN_CONDITIONALS
-
 LIBCFS_CONDITIONALS
 LN_CONDITIONALS
 LC_CONDITIONALS
@@ -693,6 +630,7 @@ LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT
+LB_CONFIG_MPITESTS
 LB_CONFIG_SERVERS
 
 # two macros for cmd3
@@ -703,13 +641,11 @@ LC_QUOTA
 
 LN_CONFIG_USERSPACE
 
-LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LUSTREIOKIT
 
 LB_DEFINE_E2FSPROGS_NAMES
 
-LC_CONFIG_LIBLUSTRE
 LIBCFS_CONFIGURE
 LN_CONFIGURE
 LC_CONFIGURE