From b8183ad3e0cfc7a2d26595befecf7a15d514e8ca Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Fri, 20 Jun 2008 00:36:04 +0000 Subject: [PATCH] Branch HEAD b=15969 Fixup the a global autoconf macro that is shared by libcfs and lnet. Fix Makefile.in to use LIBCFS_SUBDIR parameter. --- Makefile.in | 3 +-- build/autoconf/lustre-build.m4 | 2 +- libcfs/autoconf/lustre-libcfs.m4 | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4aa166b..84ab41900 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,4 @@ -subdir-m += libcfs -subdir-m += lnet +subdir-m += @LIBCFS_SUBDIR@ lnet subdir-m += lustre subdir-m += lustre-iokit diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index efd894c..dd9fc53 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -696,7 +696,7 @@ LC_CONFIG_CLIENT_SERVER # three macros for cmd3 LC_CONFIG_SPLIT LC_CONFIG_LDISKFS -LIBCFS_CONFIG_CDEBUG +LN_CONFIG_CDEBUG LB_CONFIG_MODULES diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 86fe0e6..f78c781 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -1,9 +1,9 @@ # -# LIBCFS_CONFIG_CDEBUG +# LN_CONFIG_CDEBUG # # whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) # -AC_DEFUN([LIBCFS_CONFIG_CDEBUG], +AC_DEFUN([LN_CONFIG_CDEBUG], [ AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) AC_ARG_ENABLE([libcfs_cdebug], -- 1.8.3.1