[PVFS2-CVS] commit by robl in pvfs2-1: configure configure.in pvfs2-config.h.in

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1
In directory parlweb:/tmp/cvs-serv7630

Modified Files:
	configure configure.in pvfs2-config.h.in 
Log Message:
*sigh* ... linux/xattr_acl.h was removed in 2.6.13, so now we have to
AC_CHECK_HEADERS it


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/configure,v
diff -u -w -p -u -r1.245 -r1.246
--- configure	29 Sep 2005 03:23:19 -0000	1.245
+++ configure	29 Sep 2005 16:04:42 -0000	1.246
@@ -4580,6 +4580,72 @@ echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
+for ac_header in linux/xattr_acl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define __KERNEL__
+	 #include <linux/fs.h>
+	 #ifdef HAVE_XATTR
+	 #include <linux/xattr.h>
+	 #endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
 echo "$as_me:$LINENO: checking for generic_permission api in kernel" >&5
 echo $ECHO_N "checking for generic_permission api in kernel... $ECHO_C" >&6
 CFLAGS="$USR_CFLAGS -I$lk_src/include -I$lk_src/include/asm-i386/mach-generic -I$lk_src/include/asm-i386/mach-default"

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/configure.in,v
diff -u -w -p -u -r1.248 -r1.249
--- configure.in	29 Sep 2005 03:23:20 -0000	1.248
+++ configure.in	29 Sep 2005 16:04:43 -0000	1.249
@@ -525,6 +525,16 @@ AC_TRY_COMPILE([
 	AC_MSG_RESULT(no)
 )
 
+dnl linux-2.6.11 had xattr_acl.h, but 2.6.12 did not!
+dnl cflags should be ok from above
+AC_CHECK_HEADERS([linux/xattr_acl.h], [], [], 
+	[#define __KERNEL__
+	 #include <linux/fs.h>
+	 #ifdef HAVE_XATTR 
+	 #include <linux/xattr.h> 
+	 #endif
+	 ] )
+
 AC_MSG_CHECKING(for generic_permission api in kernel)
 CFLAGS="$USR_CFLAGS -I$lk_src/include -I$lk_src/include/asm-i386/mach-generic -I$lk_src/include/asm-i386/mach-default" 
 dnl if this test passes, the kernel does not have it

Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/pvfs2-config.h.in,v
diff -u -w -p -u -r1.51 -r1.52
--- pvfs2-config.h.in	29 Sep 2005 03:23:20 -0000	1.51
+++ pvfs2-config.h.in	29 Sep 2005 16:04:43 -0000	1.52
@@ -58,6 +58,9 @@
 /* Define to 1 if you have the `efence' library (-lefence). */
 #undef HAVE_LIBEFENCE
 
+/* Define to 1 if you have the <linux/xattr_acl.h> header file. */
+#undef HAVE_LINUX_XATTR_ACL_H
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H