LU-6179 llite: Implement ladvise lockahead

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

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index eb454a1..1779ca4 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -329,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/lnet/include/uapi -I$PWD/lustre/include -I$PWD/lustre/include/uapi $CPPFLAGS"
 
 CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(CCASFLAGS)
@@ -346,6 +346,7 @@ AC_SUBST(EXTRA_KCFLAGS)
 # (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])
@@ -394,8 +395,6 @@ AC_DEFUN([LB_CONFIG_FILES], [
                lustre-iokit/ior-survey/Makefile
                lustre-iokit/stats-collect/Makefile
        )
-       AC_CONFIG_FILES([lustre/scripts/dkms.mkconf],
-                       [chmod +x lustre/scripts/dkms.mkconf])
 ])
 
 #
@@ -463,7 +462,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 ) ;;
@@ -512,6 +510,9 @@ fi
 if test x$USE_DLC = xyes ; then
        RPMBINARGS="$RPMBINARGS --with lnet_dlc"
 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