Branch b1_6

b=16455
i=brian
i=adilger

The libcfs macros can be defined as stubs in lnet. I used
m4_ifdef() for LC_CONFIG_SPLIT to localize the change to
a single branch.

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index f6ff4c4..c00d424 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -692,7 +692,7 @@ LB_CONFIG_TESTS
 LC_CONFIG_CLIENT_SERVER
 
 # two macros for cmd3 
-LC_CONFIG_SPLIT
+m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
 LN_CONFIG_CDEBUG
 LC_QUOTA