summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-05 19:36:51 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-05 19:36:51 (GMT)
commit167619a75da66f00f319ae7987a8d01c0e30c285 (patch)
tree443817539b644c259e6f0c48fc139803bc5913b5 /hl
parente8013712b23405b02e6e4d2b97b5d535558d307f (diff)
downloadhdf5-167619a75da66f00f319ae7987a8d01c0e30c285.zip
hdf5-167619a75da66f00f319ae7987a8d01c0e30c285.tar.gz
hdf5-167619a75da66f00f319ae7987a8d01c0e30c285.tar.bz2
[svn-r26132] reverted change 26177
svn merge -c -26117 . Shared Fortran libraries don't work on Mac, the check for building shared on Mac needs to stay in.
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/Makefile.am2
-rw-r--r--hl/fortran/test/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index a540a36..c8c4541 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -35,7 +35,7 @@ libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVIS
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
# pass the -static flag to the library linker.
-if HAVE_SHARED_CONDITIONAL
+if FORTRAN_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am
index 3671cdc..fa3a803 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -27,7 +27,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9X
# Some Fortran compilers can't build shared libraries, so sometimes we
# need to make sure the Fortran programs link against the static version
# of the HDF5 library. We do this by passing the -static flag to the linker.
-if HAVE_SHARED_CONDITIONAL
+if FORTRAN_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif