Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '8f34c3cfd46054f6478b34df6af324c353e44d62':
  Update tool dyn lib
  LDFLAGS module forces .so lib to be built on osx instead of .dylib
  java jni lib also needs to avoid the version-info
  HDFFV-10170 undo patch
  Add plugin options for libs

3 files changed, 7 insertions, 1 deletions

diff --git a/tools/test/h5diff/Makefile.am b/tools/test/h5diff/Makefile.am
index 1d700ea..16897c6 100644
--- a/tools/test/h5diff/Makefile.am
+++ b/tools/test/h5diff/Makefile.am
@@ -54,6 +54,7 @@ if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
   lib_LTLIBRARIES=libdynlibdiff.la
   libdynlibdiff_la_SOURCES=dynlib_diff.c
+  libdynlibdiff_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 
 install-exec-hook:
 	$(RM) $(DESTDIR)$(libdir)/*dynlib*
diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am
index a3d1df7..8723c65 100644
--- a/tools/test/h5dump/Makefile.am
+++ b/tools/test/h5dump/Makefile.am
@@ -43,6 +43,7 @@ if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
   lib_LTLIBRARIES=libdynlibdump.la
   libdynlibdump_la_SOURCES=dynlib_dump.c
+  libdynlibdump_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 
 install-exec-hook:
 	$(RM) $(DESTDIR)$(libdir)/*dynlib*
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index 22c6d96..375df47 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -47,10 +47,14 @@ h5repacktst_SOURCES=h5repacktst.c
 
 if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
-  noinst_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
+  lib_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
   libdynlibadd_la_SOURCES=dynlib_rpk.c
   libdynlibvers_la_SOURCES=dynlib_vrpk.c
+  libdynlibadd_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+  libdynlibvers_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 
+install-exec-hook:
+	$(RM) $(DESTDIR)$(libdir)/*dynlib*
 endif
 
 # Temporary files.  *.h5 are generated by h5repack.  They should