[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

8 files changed, 23 insertions, 19 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2bc8aac..56206a5 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.6)
 PROJECT (HDF5_EXAMPLES)
 
 #-----------------------------------------------------------------------------
@@ -26,12 +26,14 @@ FOREACH (example ${examples})
   ADD_EXECUTABLE (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
   TARGET_NAMING (${example} ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (${example} ${HDF5_LIB_TARGET})
+  SET_TARGET_PROPERTIES (${example} PROPERTIES FOLDER examples)
 ENDFOREACH (example ${examples})
 
 IF (H5_HAVE_PARALLEL)
   ADD_EXECUTABLE (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
   TARGET_NAMING (ph5example ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (ph5example ${HDF5_LIB_TARGET})
+  SET_TARGET_PROPERTIES (ph5example PROPERTIES FOLDER examples)
 ENDIF (H5_HAVE_PARALLEL)
 
 IF (BUILD_TESTING)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8a428ae..9ec6a85 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -97,8 +97,8 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
 h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
 h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
 
-if BUILD_SZIP_CONDITIONAL
-export LD_LIBRARY_PATH=$(LL_PATH)
+if BUILD_SHARED_SZIP_CONDITIONAL
+LD_LIBRARY_PATH=$(LL_PATH)
 endif
 
 include $(top_srcdir)/config/examples.am
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 6c03f02..c93ad12 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -145,6 +145,7 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
+FC2003 = @FC2003@
 FCFLAGS = @FCFLAGS@
 FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
@@ -165,10 +166,12 @@ H5_LONE_COLON = @H5_LONE_COLON@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HAVE_DMALLOC = @HAVE_DMALLOC@
+HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
+HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
@@ -388,6 +391,7 @@ EXTLINK_DIRS = red blue u2w
 # Note: no '/' after DESTDIR.  Explanation in commence.am
 EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
 EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
+@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
@@ -657,8 +661,6 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
 h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
 h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
 
-@BUILD_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH)
-
 # How to create EXAMPLEDIR if it doesn't already exist
 $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c
index bcbb65f..9c0918c 100644
--- a/examples/h5_elink_unix2win.c
+++ b/examples/h5_elink_unix2win.c
@@ -138,11 +138,11 @@ const H5L_class_t elink_unix2win_class[1] = {{
 static int
 unix2win_example(void)
 {
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);     		/* Group ID */
+    hid_t  fid = (-1);         /* File ID */
+    hid_t  gid = (-1);         /* Group ID */
 
     /* Create the target file. */
-#ifdef _WIN32
+#ifdef H5_HAVE_WIN32_API
     if((fid=H5Fcreate("u2w\\u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
 #else
     if((fid=H5Fcreate("u2w/u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
@@ -161,7 +161,7 @@ unix2win_example(void)
      * that external links can be traversed.
      */
 
-#ifdef _WIN32
+#ifdef H5_HAVE_WIN32_API
     /* Register the elink_unix2win class defined above to replace default
      * external links
      */
@@ -181,8 +181,8 @@ unix2win_example(void)
  error:
     printf("Error!\n");
     H5E_BEGIN_TRY {
-    	H5Gclose (gid);
-    	H5Fclose (fid);
+      H5Gclose (gid);
+      H5Fclose (fid);
     } H5E_END_TRY;
     return -1;
 }
@@ -195,7 +195,7 @@ unix2win_example(void)
 int
 main(void)
 {
-    int		ret;
+    int    ret;
 
     printf("Testing unix2win external links.\n");
     ret = unix2win_example();
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index 17ec724..c4e8d3d 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -130,7 +130,7 @@ int main(void)
     /*
      * Dereference the first reference.
      */
-    dsetv_id = H5Rdereference(dsetr_id, H5R_DATASET_REGION, &ref_out[0]);
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[0]);
     /*
      * Get name of the dataset the first region reference points to
      * using H5Rget_name
@@ -177,7 +177,7 @@ int main(void)
     /*
      * Dereference the second reference.
      */
-    dsetv_id = H5Rdereference(dsetr_id, H5R_DATASET_REGION, &ref_out[1]);
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[1]);
     space_id = H5Rget_region(dsetv_id, H5R_DATASET_REGION,&ref_out[1]);
 
     /*
diff --git a/examples/h5_reference.c b/examples/h5_reference.c
index 31aa2cf..758002f 100644
--- a/examples/h5_reference.c
+++ b/examples/h5_reference.c
@@ -128,7 +128,7 @@ main(void) {
    /*
     *  Get datatype of the dataset "B"
     */
-   did_b = H5Rdereference(did_r, H5R_OBJECT, &rbuf[1]);
+   did_b = H5Rdereference2(did_r, H5P_DEFAULT, H5R_OBJECT, &rbuf[1]);
    tid_b = H5Dget_type(did_b);
    if(H5Tequal(tid_b, H5T_NATIVE_FLOAT))
      printf("Datatype of the dataset is H5T_NATIVE_FLOAT.\n");
diff --git a/examples/run-all-ex.sh b/examples/run-all-ex.sh
index 6837c7e..4ff2c55 100755
--- a/examples/run-all-ex.sh
+++ b/examples/run-all-ex.sh
@@ -24,8 +24,8 @@
 #                                                                               #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-if (echo "Run c examples" && \ 
-   (cd c; sh ./run-c-ex.sh) && \
+echo "Run c examples"
+if ((cd c; sh ./run-c-ex.sh) && \
    (if test -d fortran; then   
        echo "Run fortran examples" 
        cd fortran; sh ./run-fortran-ex.sh 
diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in
index 0627eb8..8d0bdcd 100755
--- a/examples/run-c-ex.sh.in
+++ b/examples/run-c-ex.sh.in
@@ -32,8 +32,8 @@ EXIT_SUCCESS=0
 EXIT_FAILURE=1
  
 # Where the tool is installed.
-# Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+# default is relative path to installed location of the tools 
+prefix="${prefix:-../../../}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"