From: liangzhen <liangzhen>
Date: Thu, 2 Mar 2006 06:54:35 +0000 (+0000)
Subject: 1. Config for universal lustre headers
X-Git-Tag: v1_7_140~1^12~3^2~17
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=82897c3baae6070e793f46522a39843b6157f565;p=fs%2Flustre-release.git

1. Config for universal lustre headers
2. Fix for ltest build problem
---

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index b436017..1217643 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -575,6 +575,10 @@ AC_CHECK_FUNCS([inet_ntoa])
 # llite/xattr.c
 AC_CHECK_HEADERS([linux/xattr_acl.h])
 
+# use universal lustre headers 
+# i.e: include/obd.h instead of include/linux/obd.h
+AC_CHECK_FILE($PWD/lustre/include/obd.h, [AC_DEFINE(UNIV_LUSTRE_HEADERS, 1, [Use universal lustre headers])])
+
 # Super safe df
 AC_ARG_ENABLE([mindf],
       AC_HELP_STRING([--enable-mindf],
diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am
index 6091bd2..1547664 100644
--- a/lustre/include/Makefile.am
+++ b/lustre/include/Makefile.am
@@ -5,6 +5,13 @@
 # See the file COPYING in this distribution
 
 SUBDIRS = linux lustre
+
+linuxdir = $(includedir)
+
+if UTILS
+linux_HEADERS = lustre_idl.h
+endif
+
 EXTRA_DIST = ioctl.h liblustre.h lprocfs_status.h lustre_cfg.h \
 	     lustre_commit_confd.h lustre_debug.h lustre_dlm.h \
 	     lustre_export.h lustre_fsfilt.h lustre_ha.h       \
diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index 6d02881..0f07562 100644
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -3,12 +3,6 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-linuxdir = $(includedir)/linux
-
-if UTILS
-linux_HEADERS = lustre_idl.h
-endif
-
 EXTRA_DIST = lprocfs_status.h lustre_debug.h lustre_lib.h types.h\
   lustre_dlm.h lustre_handles.h lustre_net.h obd_class.h obd_support.h  \
   lustre_log.h lustre_compat25.h lustre_fsfilt.h lustre_mds.h obd.h \