[svn-r12346] Purpose: new feature/maintenance

Description: Added support for Zlib compression on VMS

Solution: Modified command files to add compilation and linking with
          the ZLIB library.

Platforms tested: VMS servere with the VAX floating datatype;
                   will test IEEE option later

Misc. update:

14 files changed, 97 insertions, 94 deletions

diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 053879f..577cff2 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -29,47 +29,47 @@ $ type sys$input
        Creating create 
 $ cxxlink  create, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
        Creating readdata  
 $ cxxlink  readdata, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating writedata  
 $ cxxlink  writedata, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ !                              
 $ type sys$input
 
        Creating compound 
 $ cxxlink  compound, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating extend_ds  
 $ cxxlink  extend_ds, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating chunks 
 $ cxxlink  chunks, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating h5group 
 $ cxxlink  h5group, -
            [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ exit
diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com
index 1d621fd..54cb454 100644
--- a/vms/c++/test/make.com
+++ b/vms/c++/test/make.com
@@ -32,7 +32,7 @@ $ type sys$input
        Creating testhdf5
 $ cxxlink  testhdf5,tattr,tfile, th5s, h5cpputil, -
            [-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ !                              
 $ ccc dsets
@@ -40,7 +40,7 @@ $ type sys$input
         Creating dsets
 $ cxxlink  dsets, h5cpputil, -
            [-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, -
-           [-.-.src]hdf5.olb/lib
+           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
  	Done
 $ exit
diff --git a/vms/examples/make.com b/vms/examples/make.com
index e96ada0..d993d71 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -30,45 +30,45 @@ $
 $ type sys$input
        Creating h5_write 
 $ link     h5_write, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_read 
 $ link     h5_read, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_extend_write
 $ link     h5_extend_write, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_chunk_read 
 $ link     h5_chunk_read, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_compound 
 $ link     h5_compound, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_group 
 $ link     h5_group, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_select 
 $ link     h5_select, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_attribute 
 $ link     h5_attribute, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_mount 
 $ link     h5_mount, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_reference 
 $ link     h5_reference, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_drivers
 $ link     h5_drivers, -
-            [-.src]hdf5.olb/lib
+            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 4a20c78..d378039 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -33,83 +33,83 @@ $ type sys$input
         Creating dsetexample 
 $ link       dsetexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating fileexample
 $ link       fileexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating rwdsetexample
 $ link       rwdsetexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating attrexample
 $ link       attrexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating groupexample
 $ link       groupexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpsexample
 $ link       grpsexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpdsetexample
 $ link       grpdsetexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating hyperslab
 $ link       hyperslab ,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating selectele
 $ link       selectele,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpit
 $ link       grpit,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refobjexample
 $ link       refobjexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refregexample
 $ link       refregexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating mountexample
 $ link       mountexample,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating compound
 $ link       compound,-
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/fortran/test/make.com b/vms/fortran/test/make.com
index d33ecd3..e3d2c94 100644
--- a/vms/fortran/test/make.com
+++ b/vms/fortran/test/make.com
@@ -39,18 +39,18 @@ $ library/create []h5test_fortran  t, tf
 $ link fflush1,h5test_fortran.olb/lib,-
              [-.-.test]libh5test.olb/lib, -
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ link fflush2,h5test_fortran.olb/lib,-
              [-.-.test]libh5test.olb/lib, - 
              [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib
+             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ link/exec=fortranlib_test.exe -
   fortranlib_test.obj, tH5F.obj, tH5D.obj, -
   tH5R.obj, tH5S.obj, tH5T.obj, tH5VL.obj, tH5Z.obj, tH5Sselect.obj, -
   tH5P.obj, tH5A.obj, tH5I.obj, tH5G.obj, tH5E.obj,-
   h5test_fortran.olb/lib,[-.-.test]libh5test.olb/lib, -
   [-.src]hdf5_fortran.olb/lib,-
-  [-.-.src]hdf5.olb/lib
+  [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created HDF5 Fortran tests
 $!
diff --git a/vms/make.com b/vms/make.com
index ec73370..7b6c215 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -34,12 +34,17 @@ $ copy [.tools.h5import]*.com   [-.tools.h5import]
 $ copy [.tools.h5jam]*.com      [-.tools.h5jam]
 $ copy [.tools.lib]make.com     [-.tools.lib]
 $!
+$! Define location of ZLIB library. If you do not have it on your system, download
+$! source code from http://www.zlib.net/, build and install on your system
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$!
 $! Set up compilation flags here
 $! Do not remove define=H5_VMS and standard=strict_ansi qualifiers.
 $!
-$ ccopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize"
-$ fcopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize"
-$ cxxopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize/standard=strict_ansi"
+$ ccopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
+$ fcopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
+$ cxxopt == "/float=ieee_float/define=H5_VMS/debug/nooptimize/"+-
+            "standard=strict_ansii/include=zlib_dir"
 $!
 $!
 $ hdf5top     = F$DIRECTORY()
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index a026192..2da782e 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -70,7 +70,7 @@
 /*EIP #define H5_HAVE_FEATURES_H */
 
 /* Define if support for deflate (zlib) filter is enabled */
-/*#define H5_HAVE_FILTER_DEFLATE 1*/
+#define H5_HAVE_FILTER_DEFLATE 1
 
 /* Define if support for Fletcher32 checksum is enabled */
 #define H5_HAVE_FILTER_FLETCHER32 1
diff --git a/vms/test/make.com b/vms/test/make.com
index 1c88f36..0b293ec 100644
--- a/vms/test/make.com
+++ b/vms/test/make.com
@@ -36,7 +36,7 @@ $ link     testhdf5,tarray,tattr,tconfig, -
            tmeta,tmisc,ttime,trefer,trefstr, -
            tselect,tskiplist,ttst,tunicode,tvltypes, -
            tvlstr, -
-           libh5test.olb/lib,[-.src]hdf5.olb/lib
+           libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $
 $!
 $ type sys$input
@@ -44,219 +44,219 @@ $ type sys$input
 $
 $ ccc  lheap
 $ link lheap, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating fheap test
 $
 $ ccc  fheap
 $ link fheap, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating ohdr test
 $ ccc  ohdr
 $ link ohdr, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating stab test
 $ ccc  stab
 $ link stab, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating gheap test
 $ ccc  gheap
 $ link gheap, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating btree2 test
 $ ccc  btree2
 $ link btree2, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
  
 $!
 $ type sys$input
        Creating cache test
 $ ccc  cache
 $ link cache, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating cache_api test
 $ ccc  cache_api
 $ link cache_api, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating pool test
 $ ccc  pool 
 $ link pool, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating hyperslab test
 $ ccc  hyperslab
 $ link hyperslab, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating istore test
 $ ccc  istore 
 $ link istore, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating bittests test
 $ ccc  bittests
 $ link bittests, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating dt_arith test
 $ ccc  dt_arith
 $ link dt_arith, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating dtypes test
 $ ccc  dtypes 
 $ link dtypes, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating dsets tests
 $ ccc  dsets 
 $ link/debug dsets, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating cmpd_dset test
 $ ccc  cmpd_dset
 $ link cmpd_dset, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating extend test
 $ ccc  extend
 $ link extend, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating external test
 $ ccc  external
 $ link external, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating links test
 $ ccc  links
 $ link links, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating unlink test
 $ ccc  unlink
 $ link unlink, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating big test
 $ ccc  big
 $ link big, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating mtime test
 $ ccc  mtime
 $ link/debug mtime, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating fillval test
 $ ccc  fillval
 $ link fillval, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating mount test
 $ ccc  mount
 $ link mount, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating flush1 test
 $ ccc  flush1
 $ link flush1, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating flush2 test
 $ ccc  flush2
 $ link flush2, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating enum test
 $ ccc  enum
 $ link enum, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating set_extent test
 $ ccc  set_extent
 $ link set_extent, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating ttsafe test
 $ ccc  ttsafe
 $ link ttsafe, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating getname test
 $ ccc  getname
 $ link getname, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating vfd test
 $ ccc  vfd
 $ link vfd, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating ntypes test
 $ ccc  ntypes
 $ link ntypes, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating dangle test
 $ ccc  dangle 
 $ link dangle, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating dtransform test
 $ ccc  dtransform
 $ link dtransform, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating reserved test
 $ ccc  reserved
 $ link reserved, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating cross_read test
 $ ccc  cross_read
 $ link cross_read, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Done with tests compilation
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index 3755214..5621bdb 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -29,7 +29,7 @@ $ type sys$input
        Creating h5diffgentest
 $ link/exe=h5diffgentest.exe -
            h5diffgentest, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib 
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
        Created  h5difftest
 $
@@ -37,8 +37,7 @@ $ type sys$input
        Creating h5diff
 $ link/exe=h5diff.exe -
            h5diff_main, h5diff_common, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Created  h5diff
 $!
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 44b03ed..584ff1a 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -27,14 +27,14 @@ $ ccc 'cobj
 $ type sys$input
        Creating h5dumpgentest
 $ link     h5dumpgentest, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib 
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
  	Created  h5dumpgentest
 $
 $ type sys$input
        Creating h5dump
 $ link     h5dump, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5dump
 $!
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 810fddc..705905a 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -29,14 +29,14 @@ $
 $ type sys$input
        Creating h5import
 $ link     h5import,-
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5import
 $!
 $ type sys$input
        Creating h5importtest
 $ link     h5importtest, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5importtest
 $!
diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com
index e6e7218..3549243 100644
--- a/vms/tools/h5jam/make.com
+++ b/vms/tools/h5jam/make.com
@@ -29,13 +29,13 @@ $
 $ type sys$input
        Creating tellub
 $ link     tellub -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  tellub
 $ type sys$input
        Creating getub
 $ link     getub -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  getub
 $!
@@ -43,22 +43,21 @@ $!
 $ type sys$input
        Creating h5jamgentest
 $ link     h5jamgentest, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5jamgentest
 $!
 $ type sys$input
        Creating h5jam
 $ link     h5jam, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5jam
 $!
 $ type sys$input
        Creating h5junam
 $ link     h5unjam, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5unjam
 $!
diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com
index 57c8be5..7f7e510 100644
--- a/vms/tools/h5ls/make.com
+++ b/vms/tools/h5ls/make.com
@@ -29,7 +29,7 @@ $
 $ type sys$input
        Creating h5ls
 $ link     h5ls, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 	Created  h5ls
 $!
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index a06a5de..2d7153f 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -35,7 +35,7 @@ $ link/debug/exe=h5repack.exe -
            h5repack_main, h5repack, h5repack_copy, h5repack_filters, -
            h5repack_list, h5repack_opttable, h5repack_parse, h5repack_refs, -
            h5repack_verify, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib 
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
 	Created  h5repacktst
 $
@@ -47,7 +47,7 @@ $ link/exe=h5repacktst.exe -
            h5repack, h5repack_copy, h5repack_filters, -
            h5repack_list, h5repack_opttable, h5repack_parse, h5repack_refs, -
            h5repack_verify, -
-           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 !               sys$clib/lib
 $ type sys$input
 	Created  h5repacktst