[svn-r16514] Description:

	Merge r16440:16500 from trunk into revise_chunks branch.

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/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 production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.6 (amazon) in debug mode
        Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

3 files changed, 75 insertions, 66 deletions

diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 37ee782..cde20e2 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,63 +15,65 @@ $!#
 $!
 $! Make HDF5 C++ examples
 $!
-$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
-$
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS/include=zlib_dir"
 $ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
 $!
-$ cxxobj= "create.cxx, readdata.cxx, writedata.cxx, compound.cxx,"+-
-          "extend_ds.cxx, chunks.cxx, h5group.cxx"
+$ cxxobj= "chunks.cxx, compound.cxx, create.cxx, extend_ds.cxx, h5group.cxx, "+-
+          "readdata.cxx, writedata.cxx"
 $! 
 $!                              
 $ ccc 'cxxobj
 $ type sys$input
 
-       Creating create 
-$ cxxlink  create, -
+       Creating chunks 
+$ cxxlink  chunks, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
 $ type sys$input
 
-       Creating readdata  
-$ cxxlink  readdata, -
+       Creating compound 
+$ cxxlink  compound, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating writedata  
-$ cxxlink  writedata, -
+       Creating create 
+$ cxxlink  create, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$ !                              
+$!
 $ type sys$input
 
-       Creating compound 
-$ cxxlink  compound, -
+       Creating extend_ds  
+$ cxxlink  extend_ds, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating extend_ds  
-$ cxxlink  extend_ds, -
+       Creating h5group 
+$ cxxlink  h5group, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating chunks 
-$ cxxlink  chunks, -
+       Creating readdata  
+$ cxxlink  readdata, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating h5group 
-$ cxxlink  h5group, -
+       Creating writedata  
+$ cxxlink  writedata, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!                              
+$ type sys$input
 $!
 $ exit
diff --git a/vms/c++/src/make.com b/vms/c++/src/make.com
index f407caf..37525bc 100644
--- a/vms/c++/src/make.com
+++ b/vms/c++/src/make.com
@@ -16,6 +16,10 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library
 $!
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
 $! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $ ccc := cxx 'cxxopt /include=([-.-.src])
 $!
@@ -23,60 +27,59 @@ $! type sys$input
 $!	Creating  HDF5 C++ library
 $!
 $ lib/create/object hdf5_cplus.olb
-$ ccc H5Exception.cxx
-$ lib/insert/object hdf5_cplus H5Exception
-$ ccc H5IdComponent.cxx
-$ lib/insert/object hdf5_cplus H5IdComponent
-$ ccc H5Library.cxx
-$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5AbstractDs.cxx
+$ lib/insert/object hdf5_cplus H5AbstractDs
+$ ccc H5ArrayType.cxx
+$ lib/insert/object hdf5_cplus H5ArrayType
+$ ccc H5AtomType.cxx
+$ lib/insert/object hdf5_cplus H5AtomType
 $ ccc H5Attribute.cxx
 $ lib/insert/object hdf5_cplus H5Attribute
-$ ccc H5Object.cxx
-$ lib/insert/object hdf5_cplus H5Object
-$ ccc H5PropList.cxx 
-$ lib/insert/object hdf5_cplus H5PropList
-$ ccc H5FaccProp.cxx
-$ lib/insert/object hdf5_cplus H5FaccProp
-$ ccc H5FcreatProp.cxx
-$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5CommonFG.cxx
+$ lib/insert/object hdf5_cplus H5CommonFG
+$ ccc H5CompType.cxx
+$ lib/insert/object hdf5_cplus H5CompType
+$ ccc H5DataSet.cxx
+$ lib/insert/object hdf5_cplus H5DataSet
+$ ccc H5DataSpace.cxx
+$ lib/insert/object hdf5_cplus H5DataSpace
+$ ccc H5DataType.cxx
+$ lib/insert/object hdf5_cplus H5DataType
 $ ccc H5DcreatProp.cxx
 $ lib/insert/object hdf5_cplus H5DcreatProp
 $ ccc H5DxferProp.cxx 
 $ lib/insert/object hdf5_cplus H5DxferProp
-$ ccc H5DataType.cxx
-$ lib/insert/object hdf5_cplus H5DataType
-$ ccc H5DataSpace.cxx
-$ lib/insert/object hdf5_cplus H5DataSpace
-$ ccc H5AbstractDs.cxx
-$ lib/insert/object hdf5_cplus H5AbstractDs
-$ ccc H5AtomType.cxx
-$ lib/insert/object hdf5_cplus H5AtomType
-$ ccc H5PredType.cxx
-$ lib/insert/object hdf5_cplus H5PredType
 $ ccc H5EnumType.cxx
 $ lib/insert/object hdf5_cplus H5EnumType
-$ ccc H5IntType.cxx
-$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Exception.cxx
+$ lib/insert/object hdf5_cplus H5Exception
+$ ccc H5FaccProp.cxx
+$ lib/insert/object hdf5_cplus H5FaccProp
+$ ccc H5FcreatProp.cxx
+$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5File.cxx
+$ lib/insert/object hdf5_cplus H5File
 $ ccc H5FloatType.cxx
 $ lib/insert/object hdf5_cplus H5FloatType
+$ ccc H5Group.cxx
+$ lib/insert/object hdf5_cplus H5Group
+$ ccc H5IdComponent.cxx
+$ lib/insert/object hdf5_cplus H5IdComponent
+$ ccc H5IntType.cxx
+$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Library.cxx
+$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5Object.cxx
+$ lib/insert/object hdf5_cplus H5Object
+$ ccc H5PredType.cxx
+$ lib/insert/object hdf5_cplus H5PredType
+$ ccc H5PropList.cxx 
+$ lib/insert/object hdf5_cplus H5PropList
 $ ccc H5StrType.cxx
 $ lib/insert/object hdf5_cplus H5StrType
-$ ccc H5ArrayType.cxx
-$ lib/insert/object hdf5_cplus H5ArrayType
 $ ccc H5VarLenType.cxx
 $ lib/insert/object hdf5_cplus H5VarLenType
-$ ccc H5CompType.cxx
-$ lib/insert/object hdf5_cplus H5CompType
-$ ccc H5DataSet.cxx
-$ lib/insert/object hdf5_cplus H5DataSet
-$ ccc H5CommonFG.cxx
-$ lib/insert/object hdf5_cplus H5CommonFG
-$ ccc H5Group.cxx
-$ lib/insert/object hdf5_cplus H5Group
-$ ccc H5File.cxx
-$ lib/insert/object hdf5_cplus H5File
 $!
 $ type sys$input
 	Done
 $ exit
- 
diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com
index bcf26ce..47d9370 100644
--- a/vms/c++/test/make.com
+++ b/vms/c++/test/make.com
@@ -16,30 +16,34 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library tests
 $!
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
 $! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $
 $ ccc := cxx 'cxxopt /include=([-.-.src], [-.-.test], [-.src])
 $! 
 $!
 $!                               
+$ ccc h5cpputil
 $ ccc tattr
-$ ccc tfile
 $ ccc tcompound
+$ ccc testhdf5 
+$ ccc tfile
 $ ccc tfilter
+$ ccc th5s
 $ ccc trefer
 $ ccc ttypes
 $ ccc tvlstr
-$ ccc th5s
-$ ccc h5cpputil
-$ ccc testhdf5 
 $ type sys$input
        Creating testhdf5
-$ cxxlink  testhdf5,tattr,tfile, th5s, -
-           tcompound, tfilter, trefer, tvlstr, ttypes, h5cpputil, -
+$ cxxlink  testhdf5, h5cpputil, tattr, tcompound, tfile, tfilter, th5s, -
+           trefer, ttypes, tvlstr, -
            [-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
-$ !                              
+$!
 $ ccc dsets
 $ type sys$input
         Creating dsets