[Pvfs2-cvs] commit by robl in pvfs2-1: configure pvfs2-config.h.in

CVS commit program cvs at parl.clemson.edu
Fri Oct 20 15:02:35 EDT 2006


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

Modified Files:
	configure pvfs2-config.h.in 
Log Message:
Ok, this gets us compiling again, but is almost assuredly not the correct way
to deal with the removal of i_blksize


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/configure,v
diff -u -w -p -u -r1.319 -r1.320
--- configure	12 Oct 2006 17:08:48 -0000	1.319
+++ configure	20 Oct 2006 19:02:33 -0000	1.320
@@ -7974,6 +7974,68 @@ echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+		echo "$as_me:$LINENO: checking for i_blksize in struct inode" >&5
+echo $ECHO_N "checking for i_blksize in struct inode... $ECHO_C" >&6
+	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>
+		static struct inode i = {
+			.i_blksize = 0,
+			};
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_I_BLKSIZE_IN_STRUCT_INODE 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 		echo "$as_me:$LINENO: checking for statfs_lite callback in struct super_operations in kernel" >&5
 echo $ECHO_N "checking for statfs_lite callback in struct super_operations in kernel... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF

Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/pvfs2-config.h.in,v
diff -u -w -p -u -r1.86 -r1.87
--- pvfs2-config.h.in	3 Oct 2006 19:43:07 -0000	1.86
+++ pvfs2-config.h.in	20 Oct 2006 19:02:35 -0000	1.87
@@ -1,12 +1,5 @@
 /* pvfs2-config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define to explicitly use GNU extensions */
-#undef _GNU_SOURCE
-
-/* Define if you have the GNU extended strnlen function */
-#undef HAVE_STRNLEN
-
-
 /* Define if berkeley db error reporting was enabled */
 #undef BERKDB_ERROR_REPORTING
 
@@ -129,6 +122,9 @@
 /* Define if return value from follow_link in inode_operations is type int */
 #undef HAVE_INT_RETURN_INODE_OPERATIONS_FOLLOW_LINK
 
+/* Define if struct inode in kernel has i_blksize member */
+#undef HAVE_I_BLKSIZE_IN_STRUCT_INODE
+
 /* Define if kernel has i_size_read */
 #undef HAVE_I_SIZE_READ
 
@@ -168,9 +164,6 @@
 /* Define to 1 if you have the <mntent.h> header file. */
 #undef HAVE_MNTENT_H
 
-/* Define to 1 if you have the <mntent.h,> header file. */
-#undef HAVE_MNTENT_H_
-
 /* Use the MPE profiling library */
 #undef HAVE_MPE
 
@@ -312,10 +305,10 @@
 /* sub version number */
 #undef PVFS2_VERSION_SUB
 
-/* The size of `long int', as computed by sizeof. */
+/* The size of a `long int', as computed by sizeof. */
 #undef SIZEOF_LONG_INT
 
-/* The size of `void *', as computed by sizeof. */
+/* The size of a `void *', as computed by sizeof. */
 #undef SIZEOF_VOID_P
 
 /* Define to 1 if you have the ANSI C header files. */



More information about the Pvfs2-cvs mailing list