From 1f9410e11ee99534c9ca546f43e54f02c581c3d7 Mon Sep 17 00:00:00 2001
From: James Laird <jlaird@hdfgroup.org>
Date: Wed, 3 May 2006 16:45:44 -0500
Subject: [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)
---
 config/powerpc-ibm-aix4.x | 6 ++++--
 config/powerpc-ibm-aix5.x | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
index c5af6df..7fc6994 100644
--- a/config/powerpc-ibm-aix4.x
+++ b/config/powerpc-ibm-aix4.x
@@ -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"
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 2b79ca3..833ae3f 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -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"
 
 
-- 
cgit v0.12