[Pvfs2-cvs] commit by mtmoore in pvfs2: configure

[CVS commit program]

Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv5909

Modified Files:
      Tag: Orange-Branch
	configure 
Log Message:
regenerated configure to include recent kernel.m4 changes to support newer kernels. kernel.m4 also finds autoconf.h in the new include/generated/, adds check for struct ctl_table changes, and adds check for struct xattr_handler changes.


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.414.4.13 -r1.414.4.14
--- configure	16 Dec 2010 18:55:29 -0000	1.414.4.13
+++ configure	21 Dec 2010 15:40:12 -0000	1.414.4.14
@@ -5844,7 +5844,13 @@ if test -n "$lk_src" ; then
 
 	NOSTDINCFLAGS="-Werror-implicit-function-declaration -nostdinc -isystem `$CC -print-file-name=include`"
 
-	CFLAGS="$USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty) -imacros $lk_src/include/linux/autoconf.h"
+	CFLAGS="$USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty)"
+
+		if test -f $lk_src/include/generated/autoconf.h ; then
+		CFLAGS="$CFLAGS -imacros $lk_src/include/generated/autoconf.h"
+	else
+		CFLAGS="$CFLAGS -imacros $lk_src/include/linux/autoconf.h"
+	fi
 
                 	if test -n "${ARCH}" ; then
 		CFLAGS="$CFLAGS -I$lk_src/arch/${ARCH}/include -I$lk_src/arch/${ARCH}/include/asm/mach-default"
@@ -8378,6 +8384,147 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         CFLAGS=$tmp_cflags
 
+
+		        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct ctl_table has ctl_name" >&5
+$as_echo_n "checking whether struct ctl_table has ctl_name... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/sysctl.h>
+                static struct ctl_table c = { .ctl_name = 0, };
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_CTL_NAME 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct ctl_table has strategy" >&5
+$as_echo_n "checking whether struct ctl_table has strategy... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/sysctl.h>
+                static struct ctl_table c = { .strategy = 0, };
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_STRATEGY_NAME 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+					tmp_cflags=$CFLAGS
+	CFLAGS="$CFLAGS -Werror"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for five-param xattr_handler.get" >&5
+$as_echo_n "checking for five-param xattr_handler.get... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/dcache.h>
+		#include <linux/xattr.h>
+		static struct xattr_handler x;
+		static int get_xattr_h( struct dentry *d, const char *n,
+					void *b, size_t s, int h)
+		{ return 0; }
+
+int
+main ()
+{
+
+	    x.get = get_xattr_h;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_XATTR_HANLDER_GET_FIVE_PARAM 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+					tmp_cflags=$CFLAGS
+	CFLAGS="$CFLAGS -Werror"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for six-param xattr_handler.set" >&5
+$as_echo_n "checking for six-param xattr_handler.set... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define __KERNEL__
+		#include <linux/dcache.h>
+		#include <linux/xattr.h>
+		static struct xattr_handler x;
+		static int set_xattr_h( struct dentry *d, const char *n,
+					const void *b, size_t s, int f, int h)
+		{ return 0; }
+
+int
+main ()
+{
+
+	    x.set = set_xattr_h;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_XATTR_HANLDER_SET_SIX_PARAM 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        CFLAGS=$tmp_cflags
 
 	CFLAGS=$oldcflags