[PVFS2-CVS] commit by slang in pvfs2: configure.in configure
CVS commit program
cvs at parl.clemson.edu
Mon Jun 27 18:59:56 EDT 2005
Update of /anoncvs/pvfs2
In directory parlweb:/tmp/cvs-serv11043
Modified Files:
configure.in configure
Log Message:
make --enable-strict actually work..silly AC_TRY_COMPILE adds main() without correct parameters so -Werror -Wstrict-prototypes makes that macro fail.
Index: configure.in
===================================================================
RCS file: /anoncvs/pvfs2/configure.in,v
diff -p -u -r1.238 -r1.239
--- configure.in 27 Jun 2005 20:41:21 -0000 1.238
+++ configure.in 27 Jun 2005 21:59:56 -0000 1.239
@@ -421,7 +421,7 @@ dnl 2.6 into 2.4
oldcflags=$CFLAGS
AC_MSG_CHECKING(for i_size_write in kernel)
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
dnl if this test passes, the kernel does not have it
dnl if this test fails, the kernel already defined it
AC_TRY_COMPILE([
@@ -439,7 +439,7 @@ AC_TRY_COMPILE([
)
AC_MSG_CHECKING(for i_size_read in kernel)
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
dnl if this test passes, the kernel does not have it
dnl if this test fails, the kernel already defined it
AC_TRY_COMPILE([
@@ -456,7 +456,7 @@ AC_TRY_COMPILE([
)
AC_MSG_CHECKING(for parent_ino in kernel)
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
dnl if this test passes, the kernel does not have it
dnl if this test fails, the kernel already defined it
AC_TRY_COMPILE([
@@ -475,7 +475,7 @@ AC_TRY_COMPILE([
dnl The name of this field changed from memory_backed to capabilities in 2.6.12.
AC_MSG_CHECKING(for memory_backed in struct backing_dev_info in kernel)
-CFLAGS="$CFLAGS -Werror -I$LINUX_KERNEL_SRC/include -I$LINUX_KERNEL_SRC/include/asm-i386/mach-generic"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX_KERNEL_SRC/include -I$LINUX_KERNEL_SRC/include/asm-i386/mach-generic"
AC_TRY_COMPILE([
#define __KERNEL__
#include <linux/mm.h>
@@ -694,7 +694,7 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
dnl exactly the same).
AC_MSG_CHECKING(for dbenv parameter to DB error callback function)
oldcflags=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
+ CFLAGS="$USR_CFLAGS -Werror"
AC_TRY_COMPILE([
#include <db.h>
@@ -739,7 +739,7 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
Define if third param (message) to DB error callback function is const))
fi
- CFLAGS="$CFLAGS -Wall"
+ CFLAGS="$USR_CFLAGS -Wall"
dnl Test to check for unknown third param to DB stat (four params
dnl total). The unknown parameter is a function ptr so that the
dnl the user can pass in a replcaement for malloc.
@@ -766,7 +766,7 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
dnl Test to check for txnid parameter to DB stat (DB 4.3.xx+)
if test "x$have_db_stat_malloc" = "xno" ; then
-
+
AC_MSG_CHECKING(for txnid parameter to DB stat function)
AC_TRY_COMPILE([
#include <db.h>
@@ -786,8 +786,6 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
fi
- CFLAGS=$oldcflags
-
dnl Test to check for txnid parameter to DB open (DB4.1+)
AC_MSG_CHECKING(for txnid parameter to DB open function)
AC_TRY_COMPILE([
@@ -817,6 +815,7 @@ if test "x$NEED_BERKELEY_DB" = "xyes" ;
], AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_DB_DIRTY_READ, 1, [Define if db library has DB_DIRTY_READ flag]),
AC_MSG_RESULT(no))
+ CFLAGS="$oldcflags"
fi
dnl end of NEED_BERKELEY_DB section
@@ -824,6 +823,8 @@ AC_CHECK_HEADERS(netdb.h)
AC_CHECK_HEADERS(arpa/inet.h)
dnl check for gethostbyname function
AC_MSG_CHECKING(for gethostbyname)
+oldcflags="$CFLAGS"
+CFLAGS="$USR_CFLAGS"
AC_TRY_COMPILE([
#include <netdb.h>
], [
@@ -833,6 +834,7 @@ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETHOSTBYNAME, 1, Define if gethostbyname function exists),
AC_MSG_RESULT(no)
WARN_ABOUT_HOSTNAMES="yes")
+CFLAGS="$oldcflags"
dnl configure options for GM install path
GM_HOME=
Index: configure
===================================================================
RCS file: /anoncvs/pvfs2/configure,v
diff -p -u -r1.235 -r1.236
--- configure 27 Jun 2005 20:03:21 -0000 1.235
+++ configure 27 Jun 2005 21:59:56 -0000 1.236
@@ -1429,6 +1429,11 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
+USR_CFLAGS=$CFLAGS
+if test "x$USR_CFLAGS" = "x"; then
+ USR_CFLAGS_SET=no
+fi
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2432,6 +2437,17 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+echo "$as_me:$LINENO: checking for required gcc" >&5
+echo $ECHO_N "checking for required gcc... $ECHO_C" >&6
+if test "x$GCC" = "x"; then
+ { { echo "$as_me:$LINENO: error: no" >&5
+echo "$as_me: error: no" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+CFLAGS=$USR_CFLAGS
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4189,7 +4205,7 @@ fi;
oldcflags=$CFLAGS
echo "$as_me:$LINENO: checking for i_size_write in kernel" >&5
echo $ECHO_N "checking for i_size_write in kernel... $ECHO_C" >&6
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4252,7 +4268,7 @@ rm -f conftest.err conftest.$ac_objext c
echo "$as_me:$LINENO: checking for i_size_read in kernel" >&5
echo $ECHO_N "checking for i_size_read in kernel... $ECHO_C" >&6
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4314,7 +4330,7 @@ rm -f conftest.err conftest.$ac_objext c
echo "$as_me:$LINENO: checking for parent_ino in kernel" >&5
echo $ECHO_N "checking for parent_ino in kernel... $ECHO_C" >&6
-CFLAGS="$CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX24_KERNEL_SRC/include -I${LINUX_KERNEL_SRC}/include"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4377,7 +4393,7 @@ rm -f conftest.err conftest.$ac_objext c
echo "$as_me:$LINENO: checking for memory_backed in struct backing_dev_info in kernel" >&5
echo $ECHO_N "checking for memory_backed in struct backing_dev_info in kernel... $ECHO_C" >&6
-CFLAGS="$CFLAGS -Werror -I$LINUX_KERNEL_SRC/include -I$LINUX_KERNEL_SRC/include/asm-i386/mach-generic"
+CFLAGS="$USR_CFLAGS -Werror -I$LINUX_KERNEL_SRC/include -I$LINUX_KERNEL_SRC/include/asm-i386/mach-generic"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4454,9 +4470,17 @@ SRC_ABSOLUTE_TOP=`cd $srcdir ; pwd`
# Check whether --enable-fast or --disable-fast was given.
if test "${enable_fast+set}" = set; then
enableval="$enable_fast"
- CFLAGS="$CFLAGS -DNDEBUG -O3 -DGOSSIP_DISABLE_DEBUG"
+
+if test "x$USR_CFLAGS_SET" = "xno"; then
+ CFLAGS="$CFLAGS -DNDEBUG -O3 -DGOSSIP_DISABLE_DEBUG"
+fi
+
else
- FLAGS=${CFLAGS:-"-g"}
+
+if test "x$USR_CFLAGS_SET" = "xno"; then
+ CFLAGS="$CFLAGS -g"
+fi
+
fi;
@@ -4466,7 +4490,17 @@ fi;
# Check whether --enable-strict or --disable-strict was given.
if test "${enable_strict+set}" = set; then
enableval="$enable_strict"
- CFLAGS="$CFLAGS -Wall -O2 -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
+
+if test "x$USR_CFLAGS_SET" = "xno"; then
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
+fi
+
+else
+
+if test "x$USR_CFLAGS_SET" = "xno" && test "x$enable_fast" != "xyes"; then
+ CFLAGS="$CFLAGS -O2"
+fi
+
fi;
# Check whether --enable-verbose-build or --disable-verbose-build was given.
@@ -4988,7 +5022,7 @@ echo "${ECHO_T}$lib" >&6
echo "$as_me:$LINENO: checking for dbenv parameter to DB error callback function" >&5
echo $ECHO_N "checking for dbenv parameter to DB error callback function... $ECHO_C" >&6
oldcflags=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
+ CFLAGS="$USR_CFLAGS -Werror"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5125,7 +5159,7 @@ fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- CFLAGS="$CFLAGS -Wall"
+ CFLAGS="$USR_CFLAGS -Wall"
echo "$as_me:$LINENO: checking for DB stat with malloc function ptr" >&5
echo $ECHO_N "checking for DB stat with malloc function ptr... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
@@ -5261,8 +5295,6 @@ rm -f conftest.err conftest.$ac_objext c
fi
- CFLAGS=$oldcflags
-
echo "$as_me:$LINENO: checking for txnid parameter to DB open function" >&5
echo $ECHO_N "checking for txnid parameter to DB open function... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
@@ -5387,6 +5419,7 @@ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$oldcflags"
fi
@@ -5689,6 +5722,8 @@ done
echo "$as_me:$LINENO: checking for gethostbyname" >&5
echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+oldcflags="$CFLAGS"
+CFLAGS="$USR_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5745,6 +5780,7 @@ echo "${ECHO_T}no" >&6
WARN_ABOUT_HOSTNAMES="yes"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$oldcflags"
GM_HOME=
More information about the PVFS2-CVS
mailing list