X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build.m4;h=7e2e239e939096404e92ebc67a60ac146db71810;hp=d17fb4b9e70b5e6f20a53a60a8d66aed13204a6a;hb=bcbcd5873589c71a5d1028c14e74f8897fc3ffc0;hpb=a71ab04971382c77f708d6a082e8ee2fa845e9be

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index d17fb4b..7e2e239 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -336,8 +336,8 @@ fi
 #
 AC_DEFUN([LB_CONFIG_HEADERS], [
 AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
+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
 
@@ -434,7 +434,7 @@ AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"],
 LIBCFS_CONDITIONALS
 LN_CONDITIONALS
 LC_CONDITIONALS
-]) # LB_CONTITIONALS
+]) # LB_CONDITIONALS
 
 #
 # LB_CONFIG_FILES
@@ -462,6 +462,8 @@ 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])
 ])
 
 #
@@ -532,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 ) ;;
@@ -603,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
 
@@ -647,7 +657,7 @@ LB_CONFIG_SERVERS
 AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
 
 m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
-LN_CONFIG_CDEBUG
+LIBCFS_CONFIG_CDEBUG
 LC_QUOTA
 
 LB_PATH_SNMP