Revert "LU-9564 build: Add server-build for Ubuntu with Kernel 4.4.0"

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

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 3709185..69f77e5 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -124,15 +124,20 @@ AC_SUBST(LIBCFS_SUBDIR)
 # We need it to manipulate utab file.
 #
 AC_DEFUN([LB_LIBMOUNT], [
-AC_MSG_CHECKING([whether build with 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])
-               AC_MSG_RESULT(yes)
-       ],[AC_MSG_RESULT(no)])
-], [AC_MSG_RESULT(no)])
+               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
 
 #
@@ -324,7 +329,7 @@ AS_IF([test $target_cpu = powerpc64], [
        CC="$CC -m64"
 ])
 
-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
+CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include -I$PWD/lustre/include/uapi $CPPFLAGS"
 
 CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(CCASFLAGS)
@@ -458,7 +463,6 @@ for arg; do
                -C | --cache-file=* ) ;;
                --prefix=* | --*-prefix=* ) ;;
                --enable-dist ) ;;
-               --with-release=* ) ;;
                --with-kmp-moddir=* ) ;;
                --with-linux=* | --with-linux-obj=* ) ;;
                --enable-shared | --disable-shared ) ;;
@@ -483,9 +487,6 @@ if test -n "$LINUX" ; then
                RPMBINARGS="$RPMBINARGS --define \"kobjdir $LINUX_OBJ\""
        fi
 fi
-if test -n "$KMP_MODDIR" ; then
-       RPMBINARGS="$RPMBINARGS --define \"kmoddir $KMP_MODDIR\""
-fi
 if test x$enable_modules != xyes ; then
        RPMBINARGS="$RPMBINARGS --without lustre_modules"
 fi