merge b_devel into b_setattr. highlights:

- kernel 2.5 and liblustre build changes
- fixes to Makefile.am for 7.3-era versions of automake, which is quite possibly
  the worst piece of software with which I come in contact on a daily basis
- small unlink fix

diff --git a/lustre/ptlrpc/Makefile.am b/lustre/ptlrpc/Makefile.am
index dd3f9d8..35e2928 100644 (file)
--- a/lustre/ptlrpc/Makefile.am
+++ b/lustre/ptlrpc/Makefile.am
@@ -5,10 +5,15 @@
 
 DEFS=
 
+if LIBLUSTRE
+lib_LIBRARIES = libptlrpc.a
+libptlrpc_a_SOURCES = client.c niobuf.c pack_generic.c recovd.c recover.c connection.c rpc.c events.c   # lproc_ptlrpc.c service.c
+else
 MODULE = ptlrpc
 modulefs_DATA = ptlrpc.o
 EXTRA_PROGRAMS = ptlrpc
 
 ptlrpc_SOURCES = recovd.c recover.c connection.c rpc.c events.c service.c client.c niobuf.c pack_generic.c lproc_ptlrpc.c
+endif
 
 include $(top_srcdir)/Rules