[Pvfs2-cvs] commit by slang in pvfs2: configure pvfs2-config.h.in
CVS commit program
cvs at parl.clemson.edu
Fri May 11 12:26:56 EDT 2007
Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv29808
Modified Files:
Tag: pvfs-2-6-branch
configure pvfs2-config.h.in
Log Message:
merge lk v21 fixes to branch
Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.323.6.13 -r1.323.6.14
--- configure 15 Mar 2007 16:52:04 -0000 1.323.6.13
+++ configure 11 May 2007 16:26:49 -0000 1.323.6.14
@@ -7850,7 +7850,7 @@ fi
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-i386/mach-generic -I$lk_src/include/asm-i386/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) -imacros $lk_src/include/linux/autoconf.h"
{ echo "$as_me:$LINENO: checking for i_size_write in kernel" >&5
@@ -9136,8 +9136,18 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- tmp_cflags=$CFLAGS
- CFLAGS="$CFLAGS -Werror -Wno-pointer-sign"
+ if test "x$GCC" = "xyes" ; then
+ { echo "$as_me:$LINENO: checking for gcc major version" >&5
+echo $ECHO_N "checking for gcc major version... $ECHO_C" >&6; }
+ gcc_version=`$CC --version| head -1 | tr . ' ' | cut -d ' ' -f 3`
+ { echo "$as_me:$LINENO: result: $gcc_version" >&5
+echo "${ECHO_T}$gcc_version" >&6; }
+ if test $gcc_version -gc 3 ; then
+ extra_gcc_flags="-Wno-pointer-sign -Wno-strict-aliasing -Wno-strict-aliasing=2"
+ fi
+ fi
+ tmp_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -Werror $extra_gcc_flags"
{ echo "$as_me:$LINENO: checking if statfs callbacks' arguments in kernel has struct dentry argument" >&5
echo $ECHO_N "checking if statfs callbacks' arguments in kernel has struct dentry argument... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -10698,6 +10708,64 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for two arguments to register_sysctl_table" >&5
+echo $ECHO_N "checking for two arguments to register_sysctl_table... $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/sysctl.h>
+ #include <linux/proc_fs.h>
+
+int
+main ()
+{
+
+ register_sysctl_table(NULL, 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TWO_ARG_REGISTER_SYSCTL_TABLE 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+
CFLAGS=$oldcflags
@@ -11759,6 +11827,65 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for berkeley db get_pagesize function" >&5
+echo $ECHO_N "checking for berkeley db get_pagesize function... $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. */
+
+ #include <db.h>
+
+int
+main ()
+{
+
+ int ret = 0;
+ DB *db = NULL;
+ int pagesize;
+
+ ret = db->get_pagesize(db, &pagesize);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DB_GET_PAGESIZE 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+
CFLAGS="$oldcflags"
else
@@ -12383,6 +12510,65 @@ echo "${ECHO_T}yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_DB_BUFFER_SMALL 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ { echo "$as_me:$LINENO: checking for berkeley db get_pagesize function" >&5
+echo $ECHO_N "checking for berkeley db get_pagesize function... $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. */
+
+ #include <db.h>
+
+int
+main ()
+{
+
+ int ret = 0;
+ DB *db = NULL;
+ int pagesize;
+
+ ret = db->get_pagesize(db, &pagesize);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DB_GET_PAGESIZE 1
_ACEOF
else
Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -p -u -r1.88.6.9 -r1.88.6.10
--- pvfs2-config.h.in 5 Apr 2007 15:49:34 -0000 1.88.6.9
+++ pvfs2-config.h.in 11 May 2007 16:26:56 -0000 1.88.6.10
@@ -183,9 +183,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
@@ -290,6 +287,9 @@
/* Define to 1 if you have the <sys/xattr.h> header file. */
#undef HAVE_SYS_XATTR_H
+
+/* Define if register_sysctl_table takes two arguments */
+#undef HAVE_TWO_ARG_REGISTER_SYSCTL_TABLE
/* Define if DB open function takes a txnid parameter */
#undef HAVE_TXNID_PARAMETER_TO_DB_OPEN
More information about the Pvfs2-cvs
mailing list