linux*)
lb_target_os="linux"
;;
- darwin*)
- lb_target_os="darwin"
- ;;
- solaris*)
- lb_target_os="SunOS"
- ;;
esac
AC_SUBST(lb_target_os)
]) # LB_CANONICAL_SYSTEM
]) # 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
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])
enable_utils="no"
enable_tests="no"
enable_modules="no"
- enable_liblustre="no"
])
]) # LB_CONFIG_DIST
CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+LLCPPFLAGS="-D_LARGEFILE64_SOURCE=1"
AC_SUBST(LLCPPFLAGS)
# Add _GNU_SOURCE for strnlen on linux
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])
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
eval set -- $ac_configure_args
for arg; do
case $arg in
+ --enable-dist ) ;;
--with-release=* ) ;;
--with-kmp-moddir=* ) ;;
--with-linux=* | --with-linux-obj=* ) ;;
- --enable-tests | --disable-tests ) ;;
+ --enable-ldiskfs | --disable-ldiskfs ) ;;
--enable-modules | --disable-modules ) ;;
+ --enable-server | --disable-server ) ;;
+ --enable-tests | --disable-tests ) ;;
+ --enable-utils | --disable-utils ) ;;
+ --enable-iokit | --disable-iokit ) ;;
* ) CONFIGURE_ARGS="$CONFIGURE_ARGS '$arg'" ;;
esac
done
fi
if test x$enable_tests != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_tests"
- RPMSRCARGS="$RPMSRCARGS --without lustre_tests"
+fi
+if test x$enable_utils != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without lustre_utils"
fi
if test x$enable_server != xyes ; then
RPMBINARGS="$RPMBINARGS --without servers"
RPMBINARGS="$RPMBINARGS --without lustre_iokit"
RPMSRCARGS="$RPMSRCARGS --without lustre_iokit"
fi
+if test x$BUILD_DLC != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without lnet_dlc"
+ RPMSRCARGS="$RPMSRCARGS --without lnet_dlc"
+fi
RPMBUILD_BINARY_ARGS=$RPMBINARGS
RPMBUILD_SOURCE_ARGS=$RPMSRCARGS
LB_CONFIG_UTILS
LB_CONFIG_TESTS
LC_CONFIG_CLIENT
+LB_CONFIG_MPITESTS
LB_CONFIG_SERVERS
-# two macros for cmd3
-m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
+# Tests depends from utils (multiop from liblustreapi)
+AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
+
m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
LN_CONFIG_CDEBUG
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