LU-3953 build: Only chmod dkms.mkconf once

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

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 11ca27a..7e2e239 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -449,7 +449,6 @@ AC_DEFUN([LB_CONFIG_FILES], [
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
                AC_PACKAGE_TARNAME[-dkms.spec]
-               lustre/scripts/dkms.mkconf
                contrib/Makefile
                contrib/lbuild/Makefile
                contrib/scripts/Makefile
@@ -461,9 +460,10 @@ AC_DEFUN([LB_CONFIG_FILES], [
                lustre-iokit/sgpdd-survey/Makefile
                lustre-iokit/mds-survey/Makefile
                lustre-iokit/ior-survey/Makefile
-               lustre-iokit/stats-collect/Makefile,
-               [chmod +x lustre/scripts/dkms.mkconf]
+               lustre-iokit/stats-collect/Makefile
        )
+       AC_CONFIG_FILES([lustre/scripts/dkms.mkconf],
+                       [chmod +x lustre/scripts/dkms.mkconf])
 ])
 
 #
@@ -534,6 +534,8 @@ for arg; do
                --with-release=* ) ;;
                --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 ) ;;
@@ -605,6 +607,12 @@ 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
 
 RPMBUILD_BINARY_ARGS=$RPMBINARGS