Whamcloud - gitweb
LU-15122 osd-ldiskfs: Fix ASSERTION( iobuf->dr_rw == 0 ) with 64KB PAGE_SIZE
[fs/lustre-release.git] / config / lustre-build.m4
index da3741f..a643fc0 100644 (file)
 #
-# LB_CHECK_VERSION
-#
-# Verify that LUSTRE_VERSION was defined properly
-#
-AC_DEFUN([LB_CHECK_VERSION],
-[if test "LUSTRE_VERSION" = "LUSTRE""_VERSION" ; then
-       AC_MSG_ERROR([This script was not built with a version number.])
-fi
-])
-
-#
 # LB_CANONICAL_SYSTEM
 #
 # fixup $target_os for use in other places
 #
-AC_DEFUN([LB_CANONICAL_SYSTEM],
-[case $target_os in
+AC_DEFUN([LB_CANONICAL_SYSTEM], [
+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
 
 #
-# LB_DOWNSTREAM_RELEASE
+# LB_DOWNSTREAM_RELEASE (DEPRECATED)
 #
 AC_DEFUN([LB_DOWNSTREAM_RELEASE],
-[AC_ARG_WITH([downstream-release],
-       AC_HELP_STRING([--with-downstream-release=string],
-                      [set a string in the BUILD_VERSION and RPM Release: (default is nothing)]),
-       [DOWNSTREAM_RELEASE=$with_downstream_release],
-       [
-       # if not specified, see if it's in the META file
-       if test -f META; then
-               DOWNSTREAM_RELEASE=$(sed -ne '/^LOCAL_VERSION =/s/.*= *//p' META)
-       fi
-       ])
-AC_SUBST(DOWNSTREAM_RELEASE)
-])
-
-#
-# LB_BUILDID
-#
-# Check if the source is a GA release and if not, set a "BUILDID"
-#
-# Currently there are at least two ways/modes of/for doing this.  One
-# is if we are in a valid git repository, the other is if we are in a
-# non-git source tree of some form.  Building the latter from the former
-# will be handled here.
-AC_DEFUN([LB_BUILDID],
-[
-AC_MSG_CHECKING([for buildid])
-BUILDID=""
-if git branch >/dev/null 2>&1; then
-       ffw=0
-       hash=""
-       ver=$(git describe --match v[[0-9]]_*_[[0-9]]* --tags)
-       if [[[ $ver = *-*-* ]]]; then
-               hash=${ver##*-}
-               ffw=${ver#*-}
-               ffw=${ffw%-*}
-               ver=${ver%%-*}
-       fi
-       # it's tempting to use [[ $ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$ ]]
-       # here but the portability of the regex on the right is dismal
-       # (thanx suse)
-       if echo "$ver" | egrep -q "^v([[0-9]]+_)+([[0-9]]+|RC[[0-9]]+)$"; then
-               ver=$(echo $ver | sed -e 's/^v\(.*\)/\1/' \
-                                     -e 's/_RC[[0-9]].*$//' -e 's/_/./g')
-       fi
-
-       # a "lustre fix" value of .0 should be truncated
-       if [[[ $ver = *.*.*.0 ]]]; then
-               ver=${ver%.0}
-       fi
-       # ditto for a "lustre fix" value of _0
-       if [[[ $ver = v*_*_*_0 ]]]; then
-               ver=${ver%_0}
-       fi
-       if [[[ $ver = v*_*_* ]]]; then
-               ver=${ver#v}
-               ver=${ver//_/.}
-       fi
-
-       if test "$ver" != "$VERSION"; then
-               AC_MSG_WARN([most recent tag found: $ver does not match current version $VERSION.])
-       fi
-
-       if test "$ffw" != "0"; then
-               BUILDID="$hash"
-               msg="$BUILDID (ahead by $ffw commits)"
-               AC_MSG_RESULT([$msg])
-       else
-               AC_MSG_RESULT([none... congratulations, you must be on a tag])
-       fi
-elif test -f META; then
-       BUILDID=$(sed -ne '/^BUILDID =/s/.*= *//p' META)
-       msg="$BUILDID (from META file)"
-       AC_MSG_RESULT([$msg])
-else
-       AC_MSG_WARN([FIXME: I don't know how to deal with source trees outside of git that don't have a META file.  Not setting a buildid.])
-fi
-AC_SUBST(BUILDID)
-])
+[AC_ARG_WITH([downstream-release],,
+       AC_MSG_ERROR([--downstream-release was deprecated.  Please read Documentation/versioning.txt.])
+)]) # LB_DOWNSTREAM_RELEASE
 
 #
 # LB_CHECK_FILE
 #
-# Check for file existance even when cross compiling
-#
-AC_DEFUN([LB_CHECK_FILE],
-[AS_VAR_PUSHDEF([lb_File], [lb_cv_file_$1])dnl
-AC_CACHE_CHECK([for $1], lb_File,
-[if test -r "$1"; then
-       AS_VAR_SET(lb_File, yes)
-else
-       AS_VAR_SET(lb_File, no)
-fi])
-AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
-AS_VAR_POPDEF([lb_File])dnl
-])# LB_CHECK_FILE
-
+# Check for file existence even when cross compiling
+# $1 - file to check
+# $2 - do 'yes'
+# $3 - do 'no'
+#
+AC_DEFUN([LB_CHECK_FILE], [
+AS_VAR_PUSHDEF([lb_file], [lb_cv_file_$1])dnl
+AC_CACHE_CHECK([for $1], lb_file, [
+AS_IF([test -r "$1"],
+       [AS_VAR_SET(lb_file, [yes])],
+       [AS_VAR_SET(lb_file, [no])])
+])
+AS_VAR_IF([lb_file], [yes], [$2], [$3])[]dnl
+AS_VAR_POPDEF([lb_file])dnl
+]) # LB_CHECK_FILE
 
 #
 # LB_ARG_LIBS_INCLUDES
@@ -135,241 +45,186 @@ AS_VAR_POPDEF([lb_File])dnl
 # support for --with-foo, --with-foo-includes, and --with-foo-libs in
 # a single magical macro
 #
-AC_DEFUN([LB_ARG_LIBS_INCLUDES],
-[lb_pathvar="m4_bpatsubst([$2], -, _)"
+AC_DEFUN([LB_ARG_LIBS_INCLUDES], [
+lb_pathvar="m4_bpatsubst([$2], -, _)"
 AC_MSG_CHECKING([for $1])
 AC_ARG_WITH([$2],
        AC_HELP_STRING([--with-$2=path],
                [path to $1]),
-       [],[withval=$4])
-
-if test x$withval = xyes ; then
-       eval "$lb_pathvar='$3'"
-else
-       eval "$lb_pathvar='$withval'"
-fi
+       [], [withval=$4])
+AS_IF([test "x$withval" = xyes],
+       [eval "$lb_pathvar='$3'"],
+       [eval "$lb_pathvar='$withval'"])
 AC_MSG_RESULT([${!lb_pathvar:-no}])
 
-if test x${!lb_pathvar} != x -a x${!lb_pathvar} != xno ; then
+AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [
        AC_MSG_CHECKING([for $1 includes])
        AC_ARG_WITH([$2-includes],
                AC_HELP_STRING([--with-$2-includes=path],
                        [path to $1 includes]),
-               [],[withval='yes'])
+               [], [withval="yes"])
 
        lb_includevar="${lb_pathvar}_includes"
-       if test x$withval = xyes ; then
-               eval "${lb_includevar}='${!lb_pathvar}/include'"
-       else
-               eval "${lb_includevar}='$withval'"
-       fi
+       AS_IF([test "x$withval" = xyes],
+               [eval "${lb_includevar}='${!lb_pathvar}/include'"],
+               [eval "${lb_includevar}='$withval'"])
        AC_MSG_RESULT([${!lb_includevar}])
 
        AC_MSG_CHECKING([for $1 libs])
        AC_ARG_WITH([$2-libs],
                AC_HELP_STRING([--with-$2-libs=path],
                        [path to $1 libs]),
-               [],[withval='yes'])
+               [], [withval="yes"])
 
        lb_libvar="${lb_pathvar}_libs"
-       if test x$withval = xyes ; then
-               eval "${lb_libvar}='${!lb_pathvar}/lib'"
-       else
-               eval "${lb_libvar}='$withval'"
-       fi
+       AS_IF([test "x$withval" = xyes],
+               [eval "${lb_libvar}='${!lb_pathvar}/lib'"],
+               [eval "${lb_libvar}='$withval'"])
        AC_MSG_RESULT([${!lb_libvar}])
-fi
-])
-])
-
-#
-# LB_PATH_LIBSYSIO
-#
-# Handle internal/external libsysio
-#
-AC_DEFUN([LB_PATH_LIBSYSIO],
-[AC_ARG_WITH([sysio],
-       AC_HELP_STRING([--with-sysio=path],
-                       [set path to libsysio source (default is included libsysio)]),
-       [],[
-               case $lb_target_os in
-                       linux)
-                               with_sysio='yes'
-                               ;;
-                       *)
-                               with_sysio='no'
-                               ;;
-               esac
-       ])
-AC_MSG_CHECKING([location of libsysio])
-enable_sysio="$with_sysio"
-case x$with_sysio in
-       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"
-               ;;
-       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.])
-               ])
-               SYSIO=$with_sysio
-               with_sysio="yes"
-               ;;
-esac
-
-# We have to configure even if we don't build here for make dist to work
-AC_CONFIG_SUBDIRS([libsysio])
 ])
+]) # LB_ARG_LIBS_INCLUDES
 
 #
 # LB_PATH_LUSTREIOKIT
 #
-# Handle internal/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)]),
-       [],[
-                       with_lustre_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
+# We no longer handle external lustre-iokit
+#
+AC_DEFUN([LB_PATH_LUSTREIOKIT], [
+AC_MSG_CHECKING([whether to build iokit])
+AC_ARG_ENABLE([iokit],
+       AC_HELP_STRING([--disable-iokit],
+               [disable iokit (default is enable)]),
+       [], [enable_iokit="yes"])
+AC_MSG_RESULT([$enable_iokit])
+AS_IF([test "x$enable_iokit" = xyes],
+       [LUSTREIOKIT_SUBDIR="lustre-iokit"],
+       [LUSTREIOKIT_SUBDIR=""])
 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])
-])
-
-# Define no libcfs by default.
-AC_DEFUN([LB_LIBCFS_DIR],
-[
-case x$libcfs_is_module in
-       xyes)
-          LIBCFS_INCLUDE_DIR="libcfs/include"
-          LIBCFS_SUBDIR="libcfs"
-          ;;
-        x*)
-          LIBCFS_INCLUDE_DIR="lnet/include"
-          LIBCFS_SUBDIR=""
-          ;;
-esac
-AC_SUBST(LIBCFS_SUBDIR)
-AC_SUBST(LIBCFS_INCLUDE_DIR)
+AM_CONDITIONAL([BUILD_LUSTREIOKIT], [test "x$enable_iokit" = xyes])
+]) # LB_PATH_LUSTREIOKIT
+
+#
+# LB_LIBMOUNT
+#
+# Check whether build with libmount for mount.lustre.
+# libmount is part of the util-linux since v2.18.
+# We need it to manipulate utab file.
+#
+AC_DEFUN([LB_LIBMOUNT], [
+AC_CHECK_HEADER([libmount/libmount.h], [
+       AC_CHECK_LIB([mount], [mnt_update_set_fs], [
+               LDLIBMOUNT="-lmount"
+               AC_SUBST(LDLIBMOUNT)
+               AC_DEFINE(HAVE_LIBMOUNT, 1, [build with libmount])
+               with_libmount="yes"
+       ],[with_libmount="no"])
+], [with_libmount="no"])
+AC_MSG_CHECKING([whether to build with libmount])
+AS_IF([test "x$with_libmount" = xyes], [
+       AC_MSG_RESULT([yes])
+], [
+       AC_MSG_RESULT([no])
 ])
+]) # LB_LIBMOUNT
 
 #
 # LB_PATH_SNMP
 #
 # check for in-tree snmp support
 #
-AC_DEFUN([LB_PATH_SNMP],
-[LB_CHECK_FILE([$srcdir/snmp/lustre-snmp.c],[SNMP_DIST_SUBDIR="snmp"])
+AC_DEFUN([LB_PATH_SNMP], [
+LB_CHECK_FILE([$srcdir/snmp/lustre-snmp.c], [SNMP_DIST_SUBDIR="snmp"])
 AC_SUBST(SNMP_DIST_SUBDIR)
 AC_SUBST(SNMP_SUBDIR)
-])
+]) # LB_PATH_SNMP
 
 #
 # LB_CONFIG_MODULES
 #
 # Build kernel modules?
 #
-AC_DEFUN([LB_CONFIG_MODULES],
-[AC_MSG_CHECKING([whether to build kernel modules])
+AC_DEFUN([LB_CONFIG_MODULES], [
+AC_MSG_CHECKING([whether to build Linux kernel modules])
 AC_ARG_ENABLE([modules],
        AC_HELP_STRING([--disable-modules],
-                       [disable building of Lustre kernel modules]),
-       [],[
-               LC_TARGET_SUPPORTED([
-                       enable_modules='yes'
-               ],[
-                       enable_modules='no'
-               ])
+               [disable building of Lustre kernel modules]),
+       [ AC_DEFINE(HAVE_NATIVE_LINUX_CLIENT, 1, [support native Linux client])], [
+               LC_TARGET_SUPPORTED([enable_modules="yes"],
+                                   [enable_modules="no"])
        ])
 AC_MSG_RESULT([$enable_modules ($target_os)])
 
-if test x$enable_modules = xyes ; then
-       case $target_os in
-               linux*)
+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
-                       ;;
-               darwin*)
-                       LB_PROG_DARWIN
-                       LIBCFS_PROG_DARWIN
-                       ;;
-               *)
+
+                       # 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])
-                       ;;
-       esac
-fi
+       ])
+       # Use OpenSFS UAPI header path instead of linux kernel
+       CPPFLAGS="-I$PWD/lnet/include/uapi -I$PWD/lustre/include/uapi $CPPFLAGS"
 ])
+]) # LB_CONFIG_MODULES
 
 #
 # LB_CONFIG_UTILS
 #
 # Build utils?
 #
-AC_DEFUN([LB_CONFIG_UTILS],
-[AC_MSG_CHECKING([whether to build utilities])
+AC_DEFUN([LB_CONFIG_UTILS], [
+AC_MSG_CHECKING([whether to build Lustre utilities])
 AC_ARG_ENABLE([utils],
        AC_HELP_STRING([--disable-utils],
-                       [disable building of Lustre utility programs]),
-       [],[enable_utils='yes'])
+               [disable building of Lustre utility programs]),
+       [], [enable_utils="yes"])
 AC_MSG_RESULT([$enable_utils])
-if test x$enable_utils = xyes ; then 
-       LB_CONFIG_INIT_SCRIPTS
-fi
-])
+]) # LB_CONFIG_UTILS
 
 #
 # LB_CONFIG_TESTS
 #
 # Build tests?
 #
-AC_DEFUN([LB_CONFIG_TESTS],
-[AC_MSG_CHECKING([whether to build Lustre tests])
+AC_DEFUN([LB_CONFIG_TESTS], [
+AC_MSG_CHECKING([whether to build Lustre tests])
 AC_ARG_ENABLE([tests],
        AC_HELP_STRING([--disable-tests],
-                       [disable building of Lustre tests]),
-       [],
-       [
-               enable_tests='yes'
-       ])
-AC_MSG_RESULT([$enable_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
+
 #
 # LB_CONFIG_DIST
 #
@@ -378,236 +233,261 @@ AC_MSG_RESULT([$enable_tests])
 # this simply re-adjusts some defaults, which of course can be overridden
 # on the configure line after the --for-dist option
 #
-AC_DEFUN([LB_CONFIG_DIST],
-[AC_MSG_CHECKING([whether to configure just enough for make dist])
+AC_DEFUN([LB_CONFIG_DIST], [
+AC_MSG_CHECKING([whether to configure just enough for make dist])
 AC_ARG_ENABLE([dist],
        AC_HELP_STRING([--enable-dist],
                        [only configure enough for make dist]),
-       [enable_dist='yes'],[enable_dist='no'])
+       [], [enable_dist="no"])
 AC_MSG_RESULT([$enable_dist])
-if test x$enable_dist != xno; then
-       enable_modules='no'
-       enable_utils='no'
-        enable_liblustre='no'
-        enable_doc='no'
-        enable_tests='no'
-fi
+AS_IF([test "x$enable_dist" != xno], [
+       enable_doc="no"
+       enable_utils="no"
+       enable_tests="no"
+       enable_modules="no"
 ])
+]) # LB_CONFIG_DIST
 
 #
 # LB_CONFIG_DOCS
 #
 # Build docs?
 #
-AC_DEFUN([LB_CONFIG_DOCS],
-[AC_MSG_CHECKING([whether to build docs])
-AC_ARG_ENABLE(doc,
+AC_DEFUN([LB_CONFIG_DOCS], [
+AC_MSG_CHECKING([whether to build Lustre docs])
+AC_ARG_ENABLE([doc],
        AC_HELP_STRING([--disable-doc],
                        [skip creation of pdf documentation]),
-       [
-               if test x$enable_doc = xyes ; then
-                   ENABLE_DOC=1
-               else
-                   ENABLE_DOC=0
-               fi
-       ],[
-               ENABLE_DOC=0
-               enable_doc='no'
-       ])
+       [], [enable_doc="no"])
 AC_MSG_RESULT([$enable_doc])
+AS_IF([test "x$enable_doc" = xyes],
+       [ENABLE_DOC=1], [ENABLE_DOC=0])
 AC_SUBST(ENABLE_DOC)
-])
+]) # LB_CONFIG_DOCS
 
 #
-# LB_CONFIG_INIT_SCRIPTS
+# LB_CONFIG_MANPAGES
 #
-# our init scripts only work on red hat linux
+# Build manpages?
 #
-AC_DEFUN([LB_CONFIG_INIT_SCRIPTS],
-[ENABLE_INIT_SCRIPTS=0
-if test x$enable_utils = xyes ; then
-        AC_MSG_CHECKING([whether to install init scripts])
-        # our scripts only work on red hat systems
-        if test -f /etc/init.d/functions -a -f /etc/sysconfig/network ; then
-                ENABLE_INIT_SCRIPTS=1
-                AC_MSG_RESULT([yes])
-        else
-                AC_MSG_RESULT([no])
-        fi
-fi
-AC_SUBST(ENABLE_INIT_SCRIPTS)
-])
+AC_DEFUN([LB_CONFIG_MANPAGES], [
+AC_MSG_CHECKING([whether to build Lustre manpages])
+AC_ARG_ENABLE([manpages],
+       AC_HELP_STRING([--disable-manpages],
+                       [skip creation and inclusion of man pages (default is enable)]),
+       [], [enable_manpages="yes"])
+AC_MSG_RESULT([$enable_manpages])
+]) # LB_CONFIG_MANPAGES
 
 #
 # LB_CONFIG_HEADERS
 #
 # add -include config.h
 #
-AC_DEFUN([LB_CONFIG_HEADERS],[
-       AC_CONFIG_HEADERS([config.h])
-       CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
-       EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
-       AC_SUBST(EXTRA_KCFLAGS)
-])
+AC_DEFUN([LB_CONFIG_HEADERS], [
+AC_CONFIG_HEADERS([config.h])
+CPPFLAGS="-include $PWD/undef.h -include $PWD/config.h $CPPFLAGS"
+EXTRA_KCFLAGS="-include $PWD/undef.h -include $PWD/config.h $EXTRA_KCFLAGS"
+AC_SUBST(EXTRA_KCFLAGS)
+]) # LB_CONFIG_HEADERS
 
 #
 # LB_INCLUDE_RULES
 #
 # defines for including the toplevel Rules
 #
-AC_DEFUN([LB_INCLUDE_RULES],[
-       INCLUDE_RULES="include $PWD/Rules"
-       AC_SUBST(INCLUDE_RULES)
-])
+AC_DEFUN([LB_INCLUDE_RULES], [
+INCLUDE_RULES="include $PWD/Rules"
+AC_SUBST(INCLUDE_RULES)
+]) # LB_INCLUDE_RULES
 
 #
 # LB_PATH_DEFAULTS
 #
 # 'fixup' default paths
 #
-AC_DEFUN([LB_PATH_DEFAULTS],
-[# directories for binaries
+AC_DEFUN([LB_PATH_DEFAULTS], [
+# directories for binaries
 AC_PREFIX_DEFAULT([/usr])
 
-sysconfdir='$(CROSS_PATH)/etc'
+sysconfdir='/etc'
 AC_SUBST(sysconfdir)
 
 # Directories for documentation and demos.
-docdir='$(datadir)/doc/$(PACKAGE)'
+docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
 LIBCFS_PATH_DEFAULTS
 LN_PATH_DEFAULTS
 LC_PATH_DEFAULTS
-
-])
+]) # LB_PATH_DEFAULTS
 
 #
 # LB_PROG_CC
 #
 # checks on the C compiler
 #
-AC_DEFUN([LB_PROG_CC],
-[AC_PROG_RANLIB
-AC_CHECK_TOOL(LD, ld, [no])
-AC_CHECK_TOOL(OBJDUMP, objdump, [no])
-AC_CHECK_TOOL(STRIP, strip, [no])
+AC_DEFUN([LB_PROG_CC], [
+AC_PROG_RANLIB
+AC_CHECK_TOOL(LD, [ld], [no])
+AC_CHECK_TOOL(OBJDUMP, [objdump], [no])
+AC_CHECK_TOOL(STRIP, [strip], [no])
 
 # ---------  unsigned long long sane? -------
 AC_CHECK_SIZEOF(unsigned long long, 0)
-echo "---> size SIZEOF $SIZEOF_unsigned_long_long"
-echo "---> size SIZEOF $ac_cv_sizeof_unsigned_long_long"
-if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
-       AC_MSG_ERROR([** we assume that sizeof(long long) == 8.])
-fi
+AS_IF([test $ac_cv_sizeof_unsigned_long_long != 8],
+       [AC_MSG_ERROR([we assume that sizeof(unsigned long long) == 8.])])
 
-if test $target_cpu == "powerpc64"; then
+AS_IF([test $target_cpu = powerpc64], [
        AC_MSG_WARN([set compiler with -m64])
        CFLAGS="$CFLAGS -m64"
        CC="$CC -m64"
-fi
-
-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
-
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
-AC_SUBST(LLCPPFLAGS)
+])
 
-# Add _GNU_SOURCE for strnlen on linux
-LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
-AC_SUBST(LLCFLAGS)
+# libcfs/include for util headers, lustre/include for liblustreapi and friends
+# UAPI headers from OpenSFS are included if modules support is enabled, otherwise
+# it will use the native kernel implementation.
+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
+
+#
+# Check if gcc supports -Wno-format-truncation
+#
+# To supress many warnings with gcc7
+#
+AC_DEFUN([LB_CC_NO_FORMAT_TRUNCATION], [
+       AC_MSG_CHECKING([for -Wno-format-truncation support])
+
+       saved_flags="$CFLAGS"
+       CFLAGS="$CFLAGS -Wno-format-truncation"
+
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
+               EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-format-truncation"
+               AC_SUBST(EXTRA_KCFLAGS)
+               AC_MSG_RESULT([yes])
+       ], [
+               AC_MSG_RESULT([no])
+       ])
+
+       CFLAGS="$saved_flags"
 ])
 
 #
-# LB_CONTITIONALS
+# Check if gcc supports -Wno-stringop-truncation
 #
-# AM_CONDITIONAL instances for everything
-# (so that portals/lustre can disable some if needed)
-AC_DEFUN([LB_CONDITIONALS],
-[AM_CONDITIONAL(MODULES, test x$enable_modules = xyes)
-AM_CONDITIONAL(UTILS, test x$enable_utils = xyes)
-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])
+# To supress many warnings with gcc8
+#
+AC_DEFUN([LB_CC_NO_STRINGOP_TRUNCATION], [
+       AC_MSG_CHECKING([for -Wno-stringop-truncation support])
 
-# 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
-# codename Westmere. So, $target_cpu = x86_64 should have this instruction
-# except MIC microarchitecture (k1om).
-AM_CONDITIONAL(HAVE_PCLMULQDQ, test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om")
-if test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om" ; then
-       AC_DEFINE(HAVE_PCLMULQDQ, 1, [have PCLMULQDQ instruction])
-fi
+       saved_flags="$CFLAGS"
+       CFLAGS="$CFLAGS -Werror -Wno-stringop-truncation"
 
-# this lets lustre cancel libsysio, per-branch or if liblustre is
-# disabled
-if test "x$LIBSYSIO_SUBDIR" = xlibsysio ; then
-       if test "x$with_sysio" != xyes ; then
-               SYSIO=""
-               LIBSYSIO_SUBDIR=""
-       fi
-fi
-AC_SUBST(LIBSYSIO_SUBDIR)
-AC_SUBST(SYSIO)
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
+               EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-stringop-truncation"
+               AC_SUBST(EXTRA_KCFLAGS)
+               AC_MSG_RESULT([yes])
+       ], [
+               AC_MSG_RESULT([no])
+       ])
 
-LB_DARWIN_CONDITIONALS
+       CFLAGS="$saved_flags"
+])
+
+#
+# Check if gcc supports -Wno-stringop-overflow
+#
+# To supress many warnings with gcc8
+#
+AC_DEFUN([LB_CC_NO_STRINGOP_OVERFLOW], [
+       AC_MSG_CHECKING([for -Wno-stringop-overflow support])
+
+       saved_flags="$CFLAGS"
+       CFLAGS="$CFLAGS -Wno-stringop-overflow"
+
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
+               EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-stringop-overflow"
+               AC_SUBST(EXTRA_KCFLAGS)
+               AC_MSG_RESULT([yes])
+       ], [
+               AC_MSG_RESULT([no])
+       ])
+
+       CFLAGS="$saved_flags"
+])
+
+#
+# LB_CONDITIONALS
+#
+# AM_CONDITIONAL instances for everything
+# (so that portals/lustre can disable some if needed)
+#
+AC_DEFUN([LB_CONDITIONALS], [
+AM_CONDITIONAL([PLUGINS], [test x$enable_shared = xyes])
+AM_CONDITIONAL([MODULES], [test x$enable_modules = xyes])
+AM_CONDITIONAL([UTILS], [test x$enable_utils = xyes])
+AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes])
+AM_CONDITIONAL([DOC], [test x$ENABLE_DOC = x1])
+AM_CONDITIONAL([MANPAGES], [test x$enable_manpages = xyes])
+AM_CONDITIONAL([LINUX], [test x$lb_target_os = xlinux])
+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])
 
-LIBCFS_CONDITIONALS
 LN_CONDITIONALS
 LC_CONDITIONALS
-])
+]) # LB_CONDITIONALS
 
 #
 # LB_CONFIG_FILES
 #
 # build-specific config files
 #
-AC_DEFUN([LB_CONFIG_FILES],
-[
+AC_DEFUN([LB_CONFIG_FILES], [
        AC_CONFIG_FILES([
                Makefile
                autoMakefile]
                config/Makefile
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
-               contrib/Makefile
-               contrib/lbuild/Makefile
-               contrib/scripts/Makefile
+               AC_PACKAGE_TARNAME[-dkms.spec]
                ldiskfs/Makefile
                ldiskfs/autoMakefile
+               lustre/utils/lustre.pc
+               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
        )
 ])
 
 #
 # LB_CONFIG_SERVERS
 #
-AC_DEFUN([LB_CONFIG_SERVERS],
-[
+AC_DEFUN([LB_CONFIG_SERVERS], [
 AC_ARG_ENABLE([server],
        AC_HELP_STRING([--disable-server],
-                       [disable Lustre server support]),
-       [AS_IF([test x$enable_server != xyes -a x$enable_server != xno],
-               [AC_MSG_ERROR([server valid options are "yes" or "no"])])
-       AS_IF([test x$enable_server = xyes -a x$enable_dist = xyes],
-               [AC_MSG_ERROR([--enable-server cannot be used with --enable-dist])])
-       ],
-       [AS_IF([test x$enable_dist = xyes],
-                    [enable_server=no],
-                    [enable_server=maybe])
-       ]
-)
+                       [disable Lustre server support]), [
+               AS_IF([test x$enable_server != xyes -a x$enable_server != xno],
+                       [AC_MSG_ERROR([server valid options are "yes" or "no"])])
+               AS_IF([test x$enable_server = xyes -a x$enable_dist = xyes],
+                       [AC_MSG_ERROR([--enable-server cannot be used with --enable-dist])])
+       ], [
+               AS_IF([test x$enable_dist = xyes],
+                       [enable_server=no], [enable_server=maybe])
+       ])
 
 # There are at least two good reasons why we should really run
 # LB_CONFIG_MODULES elsewhere before the call to LB_CONFIG_SERVERS:
@@ -618,80 +498,211 @@ AC_ARG_ENABLE([server],
 # before running, so until LB_CONFIG_MODULES can be reorganized, we
 # call it here.
 LB_CONFIG_MODULES
-AS_IF([test x$enable_modules = xno],[enable_server=no])
+AS_IF([test x$enable_modules = xno], [enable_server=no])
 LB_CONFIG_LDISKFS
 LB_CONFIG_ZFS
 
 # If no backends were configured, and the user did not explicitly
 # require servers to be enabled, we just disable servers.
-AS_IF([test x$enable_ldiskfs = xno -a x$enable_zfs = xno],
-       [AS_CASE([$enable_server],
+AS_IF([test x$enable_ldiskfs = xno -a x$enable_zfs = xno], [
+       AS_CASE([$enable_server],
                [maybe], [enable_server=no],
                [yes], [AC_MSG_ERROR([cannot enable servers, no backends were configured])])
-       ],
-       [AS_IF([test x$enable_server = xmaybe], [enable_server=yes])]
-)
+       ], [
+               AS_IF([test x$enable_server = xmaybe], [enable_server=yes])
+       ])
 
 AC_MSG_CHECKING([whether to build Lustre server support])
 AC_MSG_RESULT([$enable_server])
-AS_IF([test x$enable_server = xyes],
-       [AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])]
-)
+AS_IF([test x$enable_server = xyes], [
+       AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
+       AC_SUBST(ENABLE_SERVER, yes)
+], [
+       AC_SUBST(ENABLE_SERVER, no)
 ])
+]) # LB_CONFIG_SERVERS
+
+#
+# LB_CONFIG_RPMBUILD_OPTIONS
+#
+# The purpose of this function is to assemble command line options
+# for the rpmbuild command based on the options passed to the configure
+# script, and also upon the decisions that configure makes based on
+# the tests that it runs.
+# These strings can be passed to rpmbuild on the command line
+# in the Make targets named "rpms" and "srpm".
+#
+AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
+RPMBINARGS=
+CONFIGURE_ARGS=
+eval set -- $ac_configure_args
+for arg; do
+       case $arg in
+               --*dir=* ) ;;
+               -C | --cache-file=* ) ;;
+               --prefix=* | --*-prefix=* ) ;;
+               --enable-dist ) ;;
+               --with-kmp-moddir=* ) ;;
+               --with-linux=* | --with-linux-obj=* ) ;;
+               --enable-shared | --disable-shared ) ;;
+               --enable-static | --disable-static ) ;;
+               --enable-ldiskfs | --disable-ldiskfs ) ;;
+               --enable-modules | --disable-modules ) ;;
+               --enable-server | --disable-server ) ;;
+               --enable-tests | --disable-tests ) ;;
+               --enable-utils | --disable-utils ) ;;
+               --enable-iokit | --disable-iokit ) ;;
+               --enable-manpages | --disable-manpages ) ;;
+               * ) CONFIGURE_ARGS="$CONFIGURE_ARGS '$arg'" ;;
+       esac
+done
+if test -n "$CONFIGURE_ARGS" ; then
+       RPMBINARGS="$RPMBINARGS --define \"configure_args $CONFIGURE_ARGS\""
+fi
+if test -n "$LINUX" ; then
+       RPMBINARGS="$RPMBINARGS --define \"kdir $LINUX\""
+       if test -n "$LINUX_OBJ" -a "$LINUX_OBJ" != x"$LINUX" ; then
+               RPMBINARGS="$RPMBINARGS --define \"kobjdir $LINUX_OBJ\""
+       fi
+fi
+if test x$enable_modules != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without lustre_modules"
+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
+if test x$enable_server != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without servers"
+fi
+if test x$enable_ldiskfs != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without ldiskfs"
+fi
+if test x$enable_zfs = xyes ; then
+       RPMBINARGS="$RPMBINARGS --with zfs"
+fi
+if test x$enable_gss_keyring = xyes ; then
+       RPMBINARGS="$RPMBINARGS --with gss_keyring --with gss"
+fi
+if test x$enable_gss = xyes ; then
+       RPMBINARGS="$RPMBINARGS --with gss"
+       AC_SUBST(ENABLE_GSS, yes)
+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
+if test x$enable_snmp != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without snmp"
+fi
+if test x$enable_manpages != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without manpages"
+fi
+if test x$enable_shared != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without shared"
+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
+
+AC_SUBST(RPMBUILD_BINARY_ARGS)
+]) # LB_CONFIG_RPMBUILD_OPTIONS
+
+#
+# LB_CONFIG_CACHE_OPTIONS
+#
+# Propagate config cache option
+#
+AC_DEFUN([LB_CONFIG_CACHE_OPTIONS], [
+CONFIG_CACHE_FILE=
+if test -f "$cache_file"; then
+       CONFIG_CACHE_FILE=$(readlink --canonicalize "$cache_file")
+fi
+AC_SUBST(CONFIG_CACHE_FILE)
+]) # LB_CONFIG_CACHE_OPTIONS
 
 #
 # LB_CONFIGURE
 #
 # main configure steps
 #
-AC_DEFUN([LB_CONFIGURE],
-[LB_CANONICAL_SYSTEM
+AC_DEFUN([LB_CONFIGURE], [
+AC_MSG_NOTICE([Lustre base checks
+==============================================================================])
+LB_CANONICAL_SYSTEM
 
 LB_CONFIG_DIST
 
 LB_DOWNSTREAM_RELEASE
 LB_USES_DPKG
-LB_BUILDID
-
-LB_LIBCFS_DIR
 
 LB_INCLUDE_RULES
 
 LB_PATH_DEFAULTS
 
 LB_PROG_CC
+LB_CC_NO_FORMAT_TRUNCATION
+LB_CC_NO_STRINGOP_TRUNCATION
+LB_CC_NO_STRINGOP_OVERFLOW
 
 LC_OSD_ADDON
 
 LB_CONFIG_DOCS
+LB_CONFIG_MANPAGES
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT
+LB_CONFIG_MPITESTS
 LB_CONFIG_SERVERS
+LC_CONFIG_CRYPTO
 
-# two macros for cmd3
-m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
-LN_CONFIG_CDEBUG
-LC_QUOTA
+# Tests depends from utils (multiop from liblustreapi)
+AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
+
+AS_IF([test "x$enable_utils" = xyes], [
+       LC_GLIBC_SUPPORT_COPY_FILE_RANGE
+       LC_OPENSSL_SSK
+       LC_OPENSSL_GETSEPOL
+       LC_FID2PATH_ANON_UNION
+       LC_IOC_REMOVE_ENTRY
+])
+AS_IF([test "x$enable_tests" = xyes], [
+       LC_HAVE_LIBAIO
+       LC_GLIBC_SUPPORT_FHANDLES
+])
 
-LN_CONFIG_USERSPACE
+LIBCFS_CONFIG_CDEBUG
+LC_QUOTA
 
-LB_PATH_LIBSYSIO
+LB_LIBMOUNT
 LB_PATH_SNMP
 LB_PATH_LUSTREIOKIT
 
 LB_DEFINE_E2FSPROGS_NAMES
 
-LC_CONFIG_LIBLUSTRE
 LIBCFS_CONFIGURE
 LN_CONFIGURE
-
 LC_CONFIGURE
-
-if test "$SNMP_DIST_SUBDIR" ; then
-       LS_CONFIGURE
-fi
-
+AS_IF([test -n "$SNMP_DIST_SUBDIR"], [LS_CONFIGURE])
 
 LB_CONDITIONALS
 LB_CONFIG_HEADERS
@@ -700,15 +711,16 @@ LIBCFS_CONFIG_FILES
 LB_CONFIG_FILES
 LN_CONFIG_FILES
 LC_CONFIG_FILES
-if test "$SNMP_DIST_SUBDIR" ; then
-       LS_CONFIG_FILES
-fi
+AS_IF([test -n "$SNMP_DIST_SUBDIR"], [LS_CONFIG_FILES])
 
 AC_SUBST(ac_configure_args)
 
 MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symvers Module.symvers'
 AC_SUBST(MOSTLYCLEANFILES)
 
+LB_CONFIG_RPMBUILD_OPTIONS
+LB_CONFIG_CACHE_OPTIONS
+
 AC_OUTPUT
 
 cat <<_ACEOF
@@ -716,11 +728,9 @@ cat <<_ACEOF
 CC:            $CC
 LD:            $LD
 CPPFLAGS:      $CPPFLAGS
-LLCPPFLAGS:    $LLCPPFLAGS
 CFLAGS:        $CFLAGS
 EXTRA_KCFLAGS: $EXTRA_KCFLAGS
-LLCFLAGS:      $LLCFLAGS
 
 Type 'make' to build Lustre.
 _ACEOF
-])
+]) # LB_CONFIGURE