[Pvfs2-cvs] commit by pcarns in pvfs2-1/maint/config: kernel.m4 mx.m4

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/maint/config
In directory parlweb1:/tmp/cvs-serv6835/maint/config

Modified Files:
      Tag: small-file-branch
	kernel.m4 mx.m4 
Log Message:
reverse merge latest trunk changes to small-file-branch and update msgpair
usage where needed


Index: kernel.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/maint/config/kernel.m4,v
diff -p -u -r1.51.2.2 -r1.51.2.3
--- kernel.m4	7 Apr 2008 15:07:09 -0000	1.51.2.2
+++ kernel.m4	24 Jun 2008 15:01:26 -0000	1.51.2.3
@@ -244,6 +244,20 @@ AC_DEFUN([AX_KERNEL_FEATURES],
 			AC_MSG_RESULT(no)
 	)
 
+	dnl 2.6.16 removed this member
+	AC_MSG_CHECKING(for i_sem in struct inode)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/fs.h>
+		static struct inode i = {
+			.i_sem = {0},
+			};
+		], [],
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_I_SEM_IN_STRUCT_INODE, 1, Define if struct inode in kernel has i_sem member),
+			AC_MSG_RESULT(no)
+	)
+
 	dnl checking if we have a statfs_lite callback in super_operations 
 	AC_MSG_CHECKING(for statfs_lite callback in struct super_operations in kernel)
 	AC_TRY_COMPILE([
@@ -645,6 +659,32 @@ AC_DEFUN([AX_KERNEL_FEATURES],
 	    AC_MSG_RESULT(no)
 	)
 
+        AC_MSG_CHECKING(for fh_to_dentry member in export_operations in kernel)
+	AC_TRY_COMPILE([
+	    #define __KERNEL__
+	    #include <linux/exportfs.h>
+	    ], [
+	    struct export_operations x;
+	    x.fh_to_dentry = NULL;
+	    ],
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_FHTODENTRY_EXPORT_OPERATIONS, 1, Define if export_operations has an fh_to_dentry member),
+	    AC_MSG_RESULT(no)
+	)
+
+        AC_MSG_CHECKING(for encode_fh member in export_operations in kernel)
+	AC_TRY_COMPILE([
+	    #define __KERNEL__
+	    #include <linux/exportfs.h>
+	    ], [
+	    struct export_operations x;
+	    x.encode_fh = NULL;
+	    ],
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_ENCODEFH_EXPORT_OPERATIONS, 1, Define if export_operations has an encode_fh member),
+	    AC_MSG_RESULT(no)
+	)
+
 	dnl Using -Werror is not an option, because some arches throw lots of
 	dnl warnings that would trigger false negatives.  We know that the
 	dnl change to the releasepage() function signature was accompanied by
@@ -968,6 +1008,34 @@ AC_DEFUN([AX_KERNEL_FEATURES],
 	],
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_READ_INODE, 1, [Define if kernel super_operations contains read_inode field]),
+	AC_MSG_RESULT(no)
+	)
+
+	dnl older 2.6 kernels don't have MNT_NOATIME
+	AC_MSG_CHECKING(if mount.h defines MNT_NOATIME)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/mount.h>
+	], [
+		int flag = MNT_NOATIME;
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_MNT_NOATIME, 1, [Define if mount.h contains
+	MNT_NOATIME flags]),
+	AC_MSG_RESULT(no)
+	)
+
+	dnl older 2.6 kernels don't have MNT_NODIRATIME
+	AC_MSG_CHECKING(if mount.h defines MNT_NODIRATIME)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/mount.h>
+	], [
+		int flag = MNT_NODIRATIME;
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_MNT_NODIRATIME, 1, [Define if mount.h contains
+	MNT_NODIRATIME flags]),
 	AC_MSG_RESULT(no)
 	)
 

Index: mx.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/maint/config/mx.m4,v
diff -p -u -r1.1.8.1 -r1.1.8.2
--- mx.m4	7 Apr 2008 15:07:09 -0000	1.1.8.1
+++ mx.m4	24 Jun 2008 15:01:27 -0000	1.1.8.2
@@ -68,6 +68,33 @@ AC_DEFUN([AX_MX],
     AC_SUBST(BUILD_MX)
     AC_SUBST(MX_INCDIR)
     AC_SUBST(MX_LIBDIR)
+
+    if test -n "$BUILD_MX" ; then
+        dnl Check for existence of mx_decompose_endpoint_addr2
+        save_ldflags="$LDFLAGS"
+        LDFLAGS="-L$MX_LIBDIR $LDFLAGS"
+	save_libs="$LIBS"
+	LIBS="-lmyriexpress -lpthread $LIBS"
+        save_cppflags="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS -I$MX_INCDIR"
+
+        AC_MSG_CHECKING(for mx_decompose_endpoint_addr2)
+        AC_TRY_LINK([
+            #include "mx_extensions.h"
+            #include <stdlib.h>
+        ], [ 
+            mx_endpoint_addr_t epa;
+            mx_decompose_endpoint_addr2(epa, NULL, NULL, NULL);
+        ],
+            AC_MSG_RESULT(yes),
+            AC_MSG_RESULT(no)
+	    AC_MSG_ERROR([Function mx_decompose_endpoint_addr2() not found.])
+        )
+
+        LDFLAGS="$save_ldflags"
+        CPPFLAGS="$save_cppflags"
+        LIBS="$save_libs"
+    fi
 ])
 
 dnl vim: set ft=config :