#
# LB_PATH_LUSTREIOKIT
#
-# Handle internal/external lustre-iokit
+# We no longer handle external lustre-iokit
#
AC_DEFUN([LB_PATH_LUSTREIOKIT],
-[AC_ARG_WITH([lustre-iokit],
- AC_HELP_STRING([--with-lustre-iokit=path],
- [set path to lustre-iokit source (default is included lustre-iokit)]),
+[AC_ARG_ENABLE([iokit],
+ AC_HELP_STRING([--disable-iokit],
+ [disable iokit (default is enable)]),
[],[
- with_lustre_iokit='yes'
+ enable_iokit='yes'
])
-AC_MSG_CHECKING([location of lustre-iokit])
-enable_lustre_iokit="$with_lustre_iokit"
-case x$with_lustre_iokit in
- xyes)
- AC_MSG_RESULT([internal])
- LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
- AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
- ])
- LUSTREIOKIT_SUBDIR="lustre-iokit"
- LUSTREIOKIT="$PWD/lustre-iokit"
- ;;
- xno)
- AC_MSG_RESULT([disabled])
- ;;
- *)
- AC_MSG_RESULT([$with_lustre_iokit])
- LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
- AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
- ])
- LUSTREIOKIT="$with_lustre_iokit"
- ;;
-esac
+AC_MSG_CHECKING([whether to build iokit])
+AC_MSG_RESULT([$enable_iokit])
+AS_IF([test "x$enable_iokit" = xyes], [LUSTREIOKIT_SUBDIR="lustre-iokit"], [LUSTREIOKIT_SUBDIR=""])[]dnl
AC_SUBST(LUSTREIOKIT_SUBDIR)
-# We have to configure even if we don't build here for make dist to work
-AC_CONFIG_SUBDIRS([lustre-iokit])
-AM_CONDITIONAL(BUILD_LUSTREIOKIT, [test "x$with_lustre_iokit" != xno])
+AM_CONDITIONAL(BUILD_LUSTREIOKIT, [test "x$enable_iokit" = xyes])
])
# Define no libcfs by default.
LB_PROG_LINUX
LIBCFS_PROG_LINUX
LN_PROG_LINUX
+ if test x$enable_server != xno; then
+ LB_EXT4_SRC_DIR
+ fi
LC_PROG_LINUX
;;
darwin*)
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(ARCH_x86, test x$target_cpu = "xx86_64" -o x$target_cpu = "xi686")
-AM_CONDITIONAL(ARCH_MIC, test x$target_cpu = "xx86_64" -a x$target_vendor = "xk1om")
AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = 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
contrib/scripts/Makefile
ldiskfs/Makefile
ldiskfs/autoMakefile
+ lustre-iokit/Makefile
+ lustre-iokit/obdfilter-survey/Makefile
+ lustre-iokit/ost-survey/Makefile
+ lustre-iokit/sgpdd-survey/Makefile
+ lustre-iokit/mds-survey/Makefile
+ lustre-iokit/ior-survey/Makefile
+ lustre-iokit/stats-collect/Makefile
)
])
# two macros for cmd3
m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
+m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
LN_CONFIG_CDEBUG
LC_QUOTA