From 2b2a1d605e0f556fcdf38345420047b5776c7ba2 Mon Sep 17 00:00:00 2001
From: "M. Scot Breitenfeld" <brtnfld@hdfgroup.org>
Date: Thu, 18 May 2017 16:32:26 -0500
Subject: Fix for shared fortran libraries on mac (HDFFV-2772).

---
 configure.ac                         | 6 ++----
 fortran/test/fortranlib_test.F90     | 6 +++---
 fortran/test/fortranlib_test_1_8.F90 | 6 +++---
 fortran/test/fortranlib_test_F03.F90 | 6 +++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0aeda9..458a3d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -919,12 +919,10 @@ if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   AC_MSG_CHECKING([if shared Fortran libraries are supported])
   H5_FORTRAN_SHARED="yes"
 
-  ## Disable fortran shared libraries on Mac. (MAM - 03/30/11)
-
+  ## tell libtool to do the right thing with COMMON symbols
   case "`uname`" in
     Darwin*)
-    H5_FORTRAN_SHARED="no"
-    CHECK_WARN="Shared Fortran libraries not currently supported on Mac."
+    H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs"
       ;;
   esac
 
diff --git a/fortran/test/fortranlib_test.F90 b/fortran/test/fortranlib_test.F90
index 94b084e..8d5b32b 100644
--- a/fortran/test/fortranlib_test.F90
+++ b/fortran/test/fortranlib_test.F90
@@ -50,11 +50,11 @@ PROGRAM fortranlibtest
   IF(total_error .EQ. 0) THEN
 
      WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
+     WRITE(*, '(I0)', advance="NO") majnum
      WRITE(*, '(".")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") minnum
+     WRITE(*, '(I0)', advance="NO") minnum
      WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
+     WRITE(*, '(I0)') relnum
   ELSE
      total_error = total_error + 1
   ENDIF
diff --git a/fortran/test/fortranlib_test_1_8.F90 b/fortran/test/fortranlib_test_1_8.F90
index 850cab9..1306da5 100644
--- a/fortran/test/fortranlib_test_1_8.F90
+++ b/fortran/test/fortranlib_test_1_8.F90
@@ -46,11 +46,11 @@ PROGRAM fortranlibtest
   CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
   IF(total_error .EQ. 0) THEN
      WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
+     WRITE(*, '(I0)', advance="NO") majnum
      WRITE(*, '(".")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") minnum
+     WRITE(*, '(I0)', advance="NO") minnum
      WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
+     WRITE(*, '(I0)') relnum
   ELSE
      total_error = total_error + 1
   ENDIF
diff --git a/fortran/test/fortranlib_test_F03.F90 b/fortran/test/fortranlib_test_F03.F90
index ae12dba..9a74120 100644
--- a/fortran/test/fortranlib_test_F03.F90
+++ b/fortran/test/fortranlib_test_F03.F90
@@ -47,11 +47,11 @@ PROGRAM fortranlibtest_F03
   CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
   IF(total_error .EQ. 0) THEN
      WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
-     WRITE(*, '(I1)', advance="NO") majnum
+     WRITE(*, '(I0)', advance="NO") majnum
      WRITE(*, '(".")', advance="NO") 
-     WRITE(*, '(I1)', advance="NO") minnum
+     WRITE(*, '(I0)', advance="NO") minnum
      WRITE(*, '(" release ")', advance="NO")
-     WRITE(*, '(I3)') relnum
+     WRITE(*, '(I0)') relnum
   ELSE
      total_error = total_error + 1
   ENDIF
-- 
cgit v0.12