[svn-r20383] Description:

    Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

7 files changed, 31 insertions, 10 deletions

diff --git a/vms/build.com b/vms/build.com
index 3949da5..c6b972a 100644
--- a/vms/build.com
+++ b/vms/build.com
@@ -17,7 +17,7 @@ $!
 $! This file builds C, Fortran, C++ HDF5 libraries and runs the tests
 $! Specify location of the top HDF5 source directory
 $
-$ hdf5top == "sys$sysusers:[pourmal.hdf5]"
+$ hdf5top == "disk$user:[hdfgroup.hdf5]"
 $ len = F$LENGTH(hdf5top)
 $ tmp = F$EXTRACT(0, len-1, hdf5top)
 $ hdf5vms     = tmp + ".VMS]"
diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index cde20e2..45d74ce 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,7 +15,7 @@ $!#
 $!
 $! Make HDF5 C++ examples
 $!
-$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee]
 $ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS/include=zlib_dir"
 $ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
diff --git a/vms/examples/make.com b/vms/examples/make.com
index 0df772a..2de398e 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -16,9 +16,8 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C examples
 $!
-$! ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
-$
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee]
+$ ccopt = "/float=ieee_float/nowarnings/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.include])
 $ type sys$input
  	Compiling  C examples
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 591ba63..6c5bfe7 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -17,7 +17,7 @@ $!
 $! Make HDF5 Fortran examples
 $!
 $ fcopt = "/float=ieee_float/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee]
 $ fff := fortran 'fcopt /module=[-.-.include]
 $
 $ type sys$input
diff --git a/vms/make.com b/vms/make.com
index 5af9469..4be8784 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -38,7 +38,7 @@ $ copy [.tools.misc]make.com    [-.tools.misc]
 $!
 $! 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:[pourmal.zlib-1_2_3]
+$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee]
 $! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3-ieee]
 $!
 $! Set up compilation flags here
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 1a08bda..51897c8 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -65,7 +65,7 @@
 #define H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1
 
 /* Define if gettimeofday() populates the tz pointer passed in */
-#define H5_GETTIMEOFDAY_GIVES_TZ 1
+/* #define H5_GETTIMEOFDAY_GIVES_TZ 1 */
 
 /* Define to 1 if you have the `alarm' function. */
 #define H5_HAVE_ALARM 1
@@ -314,7 +314,7 @@
 /* #undef H5_HAVE_STRUCT_TEXT_INFO */
 
 /* Define if `struct timezone' is defined */
-#define H5_HAVE_STRUCT_TIMEZONE 1
+/* #define H5_HAVE_STRUCT_TIMEZONE 1 */
 
 /* Define to 1 if `tm_zone' is member of `struct tm'. */
 #define H5_HAVE_STRUCT_TM_TM_ZONE 1
@@ -377,7 +377,7 @@
 #define H5_HAVE_TMPFILE 1
 
 /* Define if `tm_gmtoff' is a member of `struct tm' */
-#define H5_HAVE_TM_GMTOFF 1
+/* #define H5_HAVE_TM_GMTOFF 1 */
 
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
diff --git a/vms/test/H5srcdir_str.h b/vms/test/H5srcdir_str.h
new file mode 100644
index 0000000..faf1b03
--- /dev/null
+++ b/vms/test/H5srcdir_str.h
@@ -0,0 +1,22 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

+ * Copyright by The HDF Group.                                               *

+ * Copyright by the Board of Trustees of the University of Illinois.         *

+ * All rights reserved.                                                      *

+ *                                                                           *

+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *

+ * terms governing use, modification, and redistribution, is contained in    *

+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *

+ * of the source code distribution tree; Copyright.html can be found at the  *

+ * root level of an installed copy of the electronic HDF5 document set and   *

+ * is linked from the top-level documents page.  It can also be found at     *

+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *

+ * access to either file, you may request a copy from help@hdfgroup.org.     *

+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

+

+/* If you are reading this file and it has a '.h' suffix, it was automatically

+ * generated from the '.in' version.  Make changes there. But for OpenVMS, this

+ * file is created by hand.

+ */

+

+/* Set the 'srcdir' path from configure time */

+static const char *config_srcdir = "[.]";