LU-5104 build: utilities cleanup

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

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 32b3861..496303b 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -531,11 +531,16 @@ CONFIGURE_ARGS=
 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
@@ -574,7 +579,9 @@ if test x$enable_modules != xyes ; then
 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"
@@ -633,6 +640,9 @@ LC_CONFIG_CLIENT
 LB_CONFIG_MPITESTS
 LB_CONFIG_SERVERS
 
+# Tests depends from utils (multiop from liblustreapi)
+AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
+
 # two macros for cmd3
 m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
 m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])