[svn-r18688] Snapshot version 1.8 release 4 (snap20)

13 files changed, 42 insertions, 30 deletions

diff --git a/README.txt b/README.txt
index 3d2efed..5e1ffc4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.4-snap20 currently under development
+HDF5 version 1.8.4-snap21 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 385af248..0e269d5 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -612,7 +612,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/configure b/configure
index 4a816f1..5d13675 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Id: configure.in 18434 2010-03-22 00:51:16Z hdftest .
+# From configure.in Id: configure.in 18658 2010-04-28 17:11:11Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for HDF5 1.8.4-snap20.
+# Generated by GNU Autoconf 2.65 for HDF5 1.8.4-snap21.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -702,8 +702,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.4-snap20'
-PACKAGE_STRING='HDF5 1.8.4-snap20'
+PACKAGE_VERSION='1.8.4-snap21'
+PACKAGE_STRING='HDF5 1.8.4-snap21'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1574,7 +1574,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.4-snap20 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.4-snap21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1644,7 +1644,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.4-snap20:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.4-snap21:";;
    esac
   cat <<\_ACEOF
 
@@ -1831,7 +1831,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.4-snap20
+HDF5 configure 1.8.4-snap21
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2915,7 +2915,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.4-snap20, which was
+It was created by HDF5 $as_me 1.8.4-snap21, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3728,7 +3728,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.4-snap20'
+ VERSION='1.8.4-snap21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -28936,7 +28936,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.4-snap20, which was
+This file was extended by HDF5 $as_me 1.8.4-snap21, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29002,7 +29002,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.4-snap20
+HDF5 config.status 1.8.4-snap21
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index a2f994e..29118b4 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl
 dnl NOTE: Don't forget to change the version number here when we do a
 dnl release!!!
 dnl
-AC_INIT([HDF5], [1.8.4-snap20], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.4-snap21], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AM_CONFIG_HEADER([src/H5config.h])
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 4d6edfb..f6d9774 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -642,7 +642,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 7dc2521..f61ac9a 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -640,7 +640,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 032d8d8..3bf06e7 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -342,7 +342,7 @@ INSTALL_FILES = ptExampleFL.cpp ptExampleVL.cpp
 CXX_API = yes
 
 # Where to install examples
-EXAMPLEDIR = $(docdir)/hdf5/examples/hl/c++
+EXAMPLEDIR = $(exec_prefix)/examples/hl/c++
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
@@ -598,7 +598,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index d4e2e94..0067e60 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -631,7 +631,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index e0acfea..58e24a9 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -348,7 +348,7 @@ INSTALL_FILES =
 FORTRAN_API = yes
 
 # Tell automake how to install examples
-EXAMPLEDIR = $(docdir)/hdf5/examples/hl/fortran
+EXAMPLEDIR = $(exec_prefix)/examples/hl/fortran
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
@@ -599,7 +599,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
 	  fi;                                                                \
 	done
-	@(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+	@if test $(TEST_SCRIPT) != X; then                                   \
+	   (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/..   \
+	   || exit 1);
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 094d997..8a1a9d7 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.4-snap20 currently under development
+HDF5 version 1.8.4-snap21 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 7048874..8ad2ebc 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -72,9 +72,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	4	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap20"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap21"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.4-snap20"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.4-snap21"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 06b6569..eebcbb6 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -484,7 +484,7 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.8.4-snap20"
+#define H5_PACKAGE_STRING "HDF5 1.8.4-snap21"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
@@ -493,7 +493,7 @@
 #define H5_PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.8.4-snap20"
+#define H5_PACKAGE_VERSION "1.8.4-snap21"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "ll"
@@ -646,7 +646,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.8.4-snap20"
+#define H5_VERSION "1.8.4-snap21"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 5e3627a..b976403 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -472,13 +472,13 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.8.4-snap20"
+#define H5_PACKAGE_STRING "HDF5 1.8.4-snap21"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.8.4-snap20"
+#define H5_PACKAGE_VERSION "1.8.4-snap21"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -635,7 +635,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.8.4-snap20"
+#define H5_VERSION "1.8.4-snap21"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */