including lustre_user now deprecated

put in a configure test (same one used in ROMIO) in case someone's using
old Lustre client headers

configure.ac

@@ -71,7 +71,7 @@ AC_ARG_WITH([lustre],
                 [support configurable Lustre striping values @<:@default=check@:>@])],
         [], [with_lustre=check])
 AS_IF([test "x$with_lustre" != xno], [
-        AC_CHECK_HEADERS([lustre/lustre_user.h], [], [
+        AC_CHECK_HEADERS([linux/lustre/lustre_user.h lustre/lustre_user.h], break, [
                 if test "x$with_lustre" != xcheck; then
                         AC_MSG_FAILURE([--with-lustre was given, <lustre/lustre_user.h> not found])
                 fi

src/aiori-POSIX.c

@@ -31,9 +31,13 @@
 #include <sys/stat.h>
 #include <assert.h>
 
+
 #ifdef HAVE_LUSTRE_LUSTRE_USER_H
 #  include <lustre/lustre_user.h>
 #endif
+#ifdef HAVE_LINUX_LUSTRE_LUSTRE_USER_H
+#  include <linux/lustre/lustre_user.h>
+#endif
 #ifdef HAVE_GPFS_H
 #  include <gpfs.h>
 #endif