X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build.m4;h=ad772c93413c354d666402accf2d506b407d2089;hp=747a987465c92d55a5d62c726747b9ff3f198f85;hb=027a7237b560489099ba490db925db17a554f37d;hpb=c99e8035ea543860f6db5e9919ff0045b56d1835;ds=sidebyside

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 747a987..ad772c9 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -357,6 +357,7 @@ AM_CONDITIONAL([USES_DPKG], [test x$uses_dpkg = xyes])
 AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes])
 AM_CONDITIONAL([RHEL], [test x$RHEL_KERNEL = xyes])
 AM_CONDITIONAL([SUSE], [test x$SUSE_KERNEL = xyes])
+AM_CONDITIONAL([UBUNTU], [test x$UBUNTU_KERNEL = xyes])
 
 # Sanity check for PCLMULQDQ instruction availability
 # PCLMULQDQ instruction is a new instruction available beginning with
@@ -438,8 +439,12 @@ AS_IF([test x$enable_ldiskfs = xno -a x$enable_zfs = xno], [
 
 AC_MSG_CHECKING([whether to build Lustre server support])
 AC_MSG_RESULT([$enable_server])
-AS_IF([test x$enable_server = xyes],
-	[AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])])
+AS_IF([test x$enable_server = xyes], [
+	AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
+	AC_SUBST(ENABLE_SERVER, yes)
+], [
+	AC_SUBST(ENABLE_SERVER, no)
+])
 ]) # LB_CONFIG_SERVERS
 
 #
@@ -472,7 +477,6 @@ for arg; do
 		--enable-tests | --disable-tests ) ;;
 		--enable-utils | --disable-utils ) ;;
 		--enable-iokit | --disable-iokit ) ;;
-		--enable-dlc | --disable-dlc ) ;;
 		--enable-manpages | --disable-manpages ) ;;
 		* ) CONFIGURE_ARGS="$CONFIGURE_ARGS '$arg'" ;;
 	esac
@@ -507,8 +511,8 @@ fi
 if test x$enable_iokit != xyes ; then
 	RPMBINARGS="$RPMBINARGS --without lustre_iokit"
 fi
-if test x$USE_DLC = xyes ; then
-	RPMBINARGS="$RPMBINARGS --with lnet_dlc"
+if test x$enable_snmp != xyes ; then
+	RPMBINARGS="$RPMBINARGS --without snmp"
 fi
 if test x$enable_manpages != xyes ; then
 	RPMBINARGS="$RPMBINARGS --without manpages"