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

[CVS commit program]

Update of /anoncvs/pvfs2/maint/config
In directory parlweb1:/tmp/cvs-serv1762/maint/config

Modified Files:
      Tag: cu-security-branch
	kernel.m4 mx.m4 
Log Message:
Updated branch with code from HEAD


Index: kernel.m4
===================================================================
RCS file: /anoncvs/pvfs2/maint/config/kernel.m4,v
diff -p -u -r1.56 -r1.56.2.1
--- kernel.m4	14 Mar 2008 21:48:53 -0000	1.56
+++ kernel.m4	16 May 2008 15:15:22 -0000	1.56.2.1
@@ -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([

Index: mx.m4
===================================================================
RCS file: /anoncvs/pvfs2/maint/config/mx.m4,v
diff -p -u -r1.1 -r1.1.6.1
--- mx.m4	12 Feb 2008 22:22:46 -0000	1.1
+++ mx.m4	16 May 2008 15:15:22 -0000	1.1.6.1
@@ -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 :