[svn-r12325]

Purpose:
Bug fix

Description:
The Daily Test errors were due to H5_CFLAGS not being included when
configure tested the sizes of some values.
Rolled back the offending changes.

Solution:
There is a "correct" solution to this problem, which is to ensure that
the H5_CFLAGS are included in autoconf's tests.
This rollback is only temporary until the "real" fix can be applied.

Platforms tested:
copper (problem only in aix config file)
This commit is contained in:
James Laird 2006-05-03 16:45:44 -05:00
parent 4c073616df
commit 1f9410e11e
2 changed files with 8 additions and 7 deletions

View File

@ -27,6 +27,9 @@
#CFLAGS="$CFLAGS -ansi"
#CPPFLAGS="$CPPFLAGS -I."
# CFLAGS must be set else configure set it to -g
CFLAGS="$CFLAGS"
# What compiler flags should be used for code development?
DEBUG_CFLAGS=
DEBUG_CPPFLAGS=
@ -101,8 +104,7 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG="-qsuffix=f=f90"
FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG} -k"
H5_FCFLAGS="$H5_FCFLAGS -static -qmoddir=./"
FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-O"
PROD_FCFLAGS="-O"

View File

@ -45,7 +45,7 @@ case $CC_BASENAME in
# Turn off shared lib option. It causes some test suite to fail.
enable_shared="${enable_shared:-no}"
# Use -D_LARGE_FILES by default to support large file size.
H5_CFLAGS="$H5_CFLAGS -qlanglvl=ansi -D_LARGE_FILES -DSTDC $CFLAGS"
CFLAGS="-qlanglvl=ansi -D_LARGE_FILES -DSTDC $CFLAGS"
DEBUG_CFLAGS="-g -qfullpath"
DEBUG_CPPFLAGS=
# -O causes test/dtypes to fail badly. Turn it off for now.
@ -60,7 +60,7 @@ case $CC_BASENAME in
;;
*)
H5_CFLAGS="$H5_CFLAGS -ansi"
CFLAGS="$CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
@ -133,8 +133,7 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG="-qsuffix=f=f90"
FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG} -k"
H5_FCFLAGS="$H5_FCFLAGS -static -qmoddir=./"
FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-O"
PROD_FCFLAGS="-O"
@ -154,6 +153,6 @@ CXX=${CXX=xlC}
# Added -qweaksymbol to suppress linker messages warning of duplicate
# symbols; these warnings are harmless. - BMR
H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
CXXFLAGS="$CXXFLAGS -qweaksymbol"