[svn-r22210] Purpose:

    Merge fix for HDFFV-944 (r22149) from trunk to hdf5_1_8.

    (Also reran bin/reconfigure which updated trace information
    for the two new MPI functions for getting/setting atomicity
    in src/H5Fmpi.c)

Tested:
    h5committest

4 files changed, 39 insertions, 37 deletions

diff --git a/configure b/configure
index ff923c0..d5559d6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 22086 2012-03-19 00:31:55Z hdftest .
+# From configure.in Id: configure.in 22141 2012-03-26 00:29:22Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.8.9-snap15.
 #
@@ -21562,22 +21562,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-case $host_os in
-  linux* | freebsd* )
-    # If gcc is not used, need to set $wl to use "-Wl,"
-    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
-      : using gcc
-    else
-      echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
-    fi
-    ;;
-esac
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should install only statically linked executables" >&5
 $as_echo_n "checking if we should install only statically linked executables... " >&6; }
 # Check whether --enable-static_exec was given.
@@ -34998,6 +34982,22 @@ touch ./config/stamp2
 # Finally the makefiles
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+case $host_os in
+  linux* | freebsd* )
+    # If gcc is not used, need to set $wl to use "-Wl,"
+    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
+      : using gcc
+    else
+      echo 'fixing $wl in' $ofile
+ed - $ofile <<EOF 2> /dev/null
+g/^wl=""/s//wl="-Wl,"/
+w
+q
+EOF
+    fi
+    ;;
+esac
+
 if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
   enable_shared=yes
 else
diff --git a/configure.in b/configure.in
index ef9f0c5..657fea4 100644
--- a/configure.in
+++ b/configure.in
@@ -1038,24 +1038,6 @@ dnl or disabled, it should happen before these macros.
 LT_PREREQ([2.2])
 LT_INIT([dlopen])
 
-dnl Post processing to patch up some deficiencies in libtool (as of
-dnl Libtool 1.5.14)
-case $host_os in
-  linux* | freebsd* )
-    # If gcc is not used, need to set $wl to use "-Wl,"
-    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
-      : using gcc
-    else
-      echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
-    fi
-    ;;
-esac
-
 dnl ----------------------------------------------------------------------
 dnl Check if we should install only statically linked executables.
 dnl   This check needs to occur after libtool is initialized because
@@ -4516,6 +4498,23 @@ touch ./config/stamp2
 # Finally the makefiles
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+dnl Post processing to patch up some deficiencies in libtool
+case $host_os in
+  linux* | freebsd* )
+    # If gcc is not used, need to set $wl to use "-Wl,"
+    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
+      : using gcc
+    else
+      echo 'fixing $wl in' $ofile
+ed - $ofile <<EOF 2> /dev/null
+g/^wl=""/s//wl="-Wl,"/
+w
+q
+EOF
+    fi
+    ;;
+esac
+
 dnl Are we compiling static libraries, shared libraries, or both?  This
 dnl is only used for the libhdf5.settings file. We can't just look at
 dnl $enable_static and $enable_shared because if they're yes the ltconfig
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 44977e2..789b079 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -118,6 +118,9 @@ Bug Fixes since HDF5-1.8.8
 
     Configuration
     -------------
+    - Fixed Makefile issue in which "-Wl," was not properly specified
+      prior to -rpath when building parallel fortran libraries with
+      an Intel compiler. (MAM - 2012/03/26)
     - Makefiles generated by other packages using h5cc as the compiler
       no longer error when 'make' is invoked more than once in order
       to 'rebuild' after changes to source. (MAM - 2012/03/26)
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index 0f612be..966528a 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -202,7 +202,7 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag)
     herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "iMi", file_id, flag);
+    H5TRACE2("e", "ib", file_id, flag);
 
     /* Check args */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
@@ -242,7 +242,7 @@ H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag)
     herr_t     ret_value = SUCCEED;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "iMi", file_id, flag);
+    H5TRACE2("e", "i*b", file_id, flag);
 
     /* Check args */
     if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))