[svn-r17896] Description:

	Bring r17546:17895 from trunk to revise_chunks branch.  Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces.  Also, other adjustments to source code
and expected output in response to changes on the trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 15 insertions, 7 deletions

diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 80925f0..ac70bac 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -48,7 +48,8 @@ case $CC_BASENAME in
     enable_shared="${enable_shared:-no}"
     # Use -D_LARGE_FILES by default to support large file size.
     # Make sure this is applied to other API compile options such as C++.
-    CFLAGS="-qlanglvl=stdc99 -D_LARGE_FILES $CFLAGS"
+    AM_CFLAGS="-D_LARGE_FILES $AM_CFLAGS"
+    H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
     DEBUG_CFLAGS="-g -qfullpath"
     DEBUG_CPPFLAGS=
     # -O causes test/dtypes to fail badly. Turn it off for now.
@@ -63,7 +64,7 @@ case $CC_BASENAME in
     ;;
 
   *)
-    CFLAGS="$CFLAGS -ansi"
+    H5_CFLAGS="$H5_CFLAGS -ansi"
     DEBUG_CFLAGS="-g"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O"
@@ -128,15 +129,21 @@ ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
 
 if test "X-" = "X-$FC"; then
   if test "X-$enable_parallel" = "X-yes"; then
-    FC=mpxlf_r
+    FC=mpxlf90_r
   else
-    FC=xlf
+    FC=xlf90
   fi
 fi
 
+# While we try to avoid setting FCFLAGS directly for use in compilation, in 
+# this case we need the -k flag present for some configure checks. As such, 
+# the configure script saves the user's set FCFLAGS before running, and 
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
+# to ensure the flag is present for both configure as well as for the build.
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FCFLAGS="$FCFLAGS -O ${F9XSUFFIXFLAG}"
+  H5_FCFLAGS="$H5_FCFLAGS -O ${F9XSUFFIXFLAG}"
   FSEARCH_DIRS="-I./ -I../src"
   DEBUG_FCFLAGS="-O"
   PROD_FCFLAGS="-O"
@@ -147,7 +154,7 @@ fi
 # With poe version 3.2.0.19 or lower(using lpp -l all | grep ppe.poe to check the version number, 
 # IBM MPI-IO implementation has a bug, 
 #it cannot generate correct MPI derived datatype. Please uncomment the following line:
-#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 
 # The default C++ compiler
 
@@ -157,6 +164,7 @@ CXX=${CXX=xlC}
 # Added -qweaksymbol to suppress linker messages warning of duplicate
 # symbols; these warnings are harmless. - BMR
 # Use -D_LARGE_FILES by default to support large file size.
-CXXFLAGS="$CXXFLAGS -qweaksymbol -D_LARGE_FILES"
+H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
+AM_CXXFLAGS="$AM_CXXFLAGS -D_LARGE_FILES"