From 356b11c36639b3470c197129a92f4cf26f61d87a Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Sun, 19 Dec 2004 23:52:06 +0000
Subject: [PATCH] fixes for make rpms

---
 .cvsignore                     |  1 +
 build/autoMakefile.am          |  2 +-
 build/autoMakefile.am.toplevel |  2 ++
 lnet/autoconf/lustre-lnet.m4   | 43 ++++++++++++++++++++++++++++++++++++++++--
 lustre/autoMakefile.am         |  3 +--
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 386b60d..258285b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -31,3 +31,4 @@ install-sh
 config.h
 config.h.in
 stamp-h1
+INSTALL
diff --git a/build/autoMakefile.am b/build/autoMakefile.am
index 95994a4..9feea25 100644
--- a/build/autoMakefile.am
+++ b/build/autoMakefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST := Makefile Makefile.in.toplevel autoMakefile.am.toplevel	\
 	linux-merge-modules.awk linux-rhconfig.h lmake			\
 	lustre-kernel-2.4.spec.in lustre.spec lustre.spec		\
 	suse-functions.sh suse-post.sh suse-postun.sh			\
-	suse-trigger-script.sh.in
+	suse-trigger-script.sh.in README.kernel-source
 
 SUBDIRS := autoconf
diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 7bb6337..5336f2c 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS := . build @LIBSYSIO_SUBDIR@ portals lustre
 DIST_SUBDIRS := build @LIBSYSIO_SUBDIR@ portals lustre
 
diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 0cb49a2..41f42b5 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -187,6 +187,41 @@ AC_SUBST(IIBNAL)
 ])
 
 #
+# LP_CONFIG_RANAL
+#
+# check whether to use the RapidArray nal
+#
+AC_DEFUN([LP_CONFIG_RANAL],
+[#### Rapid Array
+AC_MSG_CHECKING([if RapidArray kernel headers are present])
+# placeholder
+RACPPFLAGS="-I/tmp"
+EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS $RACPPFLAGS"
+LB_LINUX_TRY_COMPILE([
+	#include <linux/types.h>
+	#include <rapl.h>
+],[
+        RAP_RETURN          rc;
+	RAP_PVOID           dev_handle;
+
+        rc = RapkGetDeviceByIndex(0, NULL, &dev_handle);
+
+	return rc == RAP_SUCCESS ? 0 : 1;
+],[
+	AC_MSG_RESULT([yes])
+	RANAL="ranal"
+],[
+	AC_MSG_RESULT([no])
+	RANAL=""
+	RACPPFLAGS=""
+])
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
+AC_SUBST(RACPPFLAGS)
+AC_SUBST(RANAL)
+])
+
+#
 # LP_STRUCT_PAGE_LIST
 #
 # 2.6.4 no longer has page->list
@@ -301,6 +336,7 @@ if test $linux25 = 'no' ; then
 	LP_CONFIG_OPENIB
 fi
 LP_CONFIG_IIB
+LP_CONFIG_RANAL
 
 LP_STRUCT_PAGE_LIST
 LP_STRUCT_SIGHAND
@@ -438,6 +474,7 @@ AC_DEFUN([LP_CONDITIONALS],
 AM_CONDITIONAL(BUILD_GMNAL, test x$GMNAL = "xgmnal")
 AM_CONDITIONAL(BUILD_OPENIBNAL, test x$OPENIBNAL = "xopenibnal")
 AM_CONDITIONAL(BUILD_IIBNAL, test x$IIBNAL = "xiibnal")
+AM_CONDITIONAL(BUILD_RANAL, test x$RANAL = "xranal")
 ])
 
 #
@@ -461,14 +498,16 @@ portals/knals/gmnal/Makefile
 portals/knals/gmnal/autoMakefile
 portals/knals/iibnal/Makefile
 portals/knals/iibnal/autoMakefile
+portals/knals/lonal/Makefile
+portals/knals/lonal/autoMakefile
 portals/knals/openibnal/Makefile
 portals/knals/openibnal/autoMakefile
 portals/knals/qswnal/Makefile
 portals/knals/qswnal/autoMakefile
+portals/knals/ranal/Makefile
+portals/knals/ranal/autoMakefile
 portals/knals/socknal/Makefile
 portals/knals/socknal/autoMakefile
-portals/knals/lonal/Makefile
-portals/knals/lonal/autoMakefile
 portals/libcfs/Makefile
 portals/libcfs/autoMakefile
 portals/portals/Makefile
diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 8211b00..a8197e1 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -9,8 +9,7 @@ SUBDIRS = include ldiskfs lvfs obdclass lov ldlm ptlrpc      \
 	obdecho osc mdc lmv  mds obdfilter ost llite cobd ptlbd smfs snapfs \
 	cmobd liblustre doc utils tests conf scripts autoconf
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches \
-	README.kernel-source
+EXTRA_DIST = BUGS FDL Rules.in kernel_patches
 
 if LDISKFS
 LDISKFS = ldiskfs-sources
-- 
1.8.3.1