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/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 752bf9b..480e52a 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1587,3 +1587,12 @@ lnet/libcfs/darwin/Makefile
                ;;
 esac
 ])
+
+#
+# LIBCFS stub macros. (These are defined in the libcfs module on HEAD))
+#
+AC_DEFUN([LIBCFS_PATH_DEFAULTS], [])
+AC_DEFUN([LIBCFS_PROG_LINUX], [])
+AC_DEFUN([LIBCFS_CONDITIONALS], [])
+AC_DEFUN([LIBCFS_CONFIGURE], [])
+AC_DEFUN([LIBCFS_CONFIG_FILES], [])