[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, 8 insertions, 8 deletions

diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index 9bebd37..1961119 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -50,7 +50,7 @@ case $CC_BASENAME in
 	;;
 
     *)
-	CFLAGS="$CFLAGS -ansi"
+	H5_CFLAGS="$H5_CFLAGS -ansi"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS="-O"
@@ -76,7 +76,7 @@ case $FC in
     # this is for efc v7.  Older efc do not work with these.
     # -Vaxlib is for non-standard fortran calls like exit().
     MORE_FCFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
-    FCFLAGS="$FCFLAGS $MORE_FCFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $MORE_FCFLAGS"
     f9x_flags_set=yes
     ;;
 
@@ -89,7 +89,7 @@ esac
 if test "X$f9x_flags_set" = "X"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS"
+  H5_FCFLAGS="$H5_FCFLAGS"
   DEBUG_FCFLAGS=""
   PROD_FCFLAGS=""
   PROFILE_FCFLAGS=""
@@ -113,7 +113,7 @@ fi
 case $CXX_BASENAME in
     ecc|icc)	# Intel compilers
 	# Default to C99 standard.
-	CXXFLAGS="${CXXFLAGS:--std=c99}"
+	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
 	DEBUG_CXXFLAGS="-g -w2 -Wall"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS=""     #Default optimization O2 is used
@@ -122,7 +122,7 @@ case $CXX_BASENAME in
 	PROFILE_CPPFLAGS=
 	;;
     g++)
-	CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
+	H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
 	DEBUG_CXXFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
@@ -133,7 +133,7 @@ case $CXX_BASENAME in
 
     *)
 	# Default to C99 standard.
-	CXXFLAGS="${CXXFLAGS:--std=c99}"
+	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
 	DEBUG_CXXFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O"
@@ -146,8 +146,8 @@ esac
 # Check MPICH settings
 . $srcdir/config/mpich
 #Uncomment the next line if your system doesn't support MPI complex derived datatype.
-#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'}
 #Comment out the following line if your system supports collective IO when some processes
 #don't have any contributions to IOs.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
+hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}