X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build.m4;h=da197bab29033ae8ed8c42a06d86c381c0d2560f;hb=17f35d4948a0970fa76dc491037c0a8e8d95e813;hp=496303bc64a321c2d2ad12a32122503ba8edb2f9;hpb=adf2e9d9ab987b46fa0269038f348cf2a17fd0e0;p=fs%2Flustre-release.git

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 496303b..da197ba 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -396,7 +396,7 @@ AS_IF([test $target_cpu = powerpc64], [
 
 CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
 
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+LLCPPFLAGS="-D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
 
 # Add _GNU_SOURCE for strnlen on linux
@@ -599,6 +599,10 @@ if test x$enable_iokit != xyes ; then
 	RPMBINARGS="$RPMBINARGS --without lustre_iokit"
 	RPMSRCARGS="$RPMSRCARGS --without lustre_iokit"
 fi
+if test x$BUILD_DLC != xyes ; then
+	RPMBINARGS="$RPMBINARGS --without lnet_dlc"
+	RPMSRCARGS="$RPMSRCARGS --without lnet_dlc"
+fi
 
 RPMBUILD_BINARY_ARGS=$RPMBINARGS
 RPMBUILD_SOURCE_ARGS=$RPMSRCARGS
@@ -643,8 +647,6 @@ 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])
 LN_CONFIG_CDEBUG
 LC_QUOTA