X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build.m4;h=21976fc695f313117e66754d1c00995d41ddaf1c;hb=75f07b2fa054b69d1c20eef8dddb831af41fd7a5;hp=c3bf6690bb583276cdedbd24a867bf8226f5377f;hpb=4c3858b3c88d2a2f443d348945229f5995f3e1dd;p=fs%2Flustre-release.git

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index c3bf669..21976fc69 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
@@ -449,6 +449,7 @@ 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
@@ -460,7 +461,8 @@ 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
+		lustre-iokit/stats-collect/Makefile,
+		[chmod +x lustre/scripts/dkms.mkconf]
 	)
 ])
 
@@ -521,7 +523,6 @@ AS_IF([test x$enable_server = xyes],
 #
 AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
 RPMBINARGS=
-RPMSRCARGS=
 CONFIGURE_ARGS=
 eval set -- $ac_configure_args
 for arg; do
@@ -533,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 ) ;;
@@ -604,12 +607,16 @@ 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
-RPMBUILD_SOURCE_ARGS=$RPMSRCARGS
 
 AC_SUBST(RPMBUILD_BINARY_ARGS)
-AC_SUBST(RPMBUILD_SOURCE_ARGS)
 ]) # LB_CONFIG_RPMBUILD_OPTIONS
 
 #
@@ -650,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