diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-05 19:36:51 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-05 19:36:51 (GMT) |
| commit | 167619a75da66f00f319ae7987a8d01c0e30c285 (patch) | |
| tree | 443817539b644c259e6f0c48fc139803bc5913b5 /fortran | |
| parent | e8013712b23405b02e6e4d2b97b5d535558d307f (diff) | |
| download | hdf5-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 'fortran')
| -rw-r--r-- | fortran/src/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/test/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index e5db074..a4b3843 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -37,7 +37,7 @@ libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISIO # 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/fortran/test/Makefile.am b/fortran/test/Makefile.am index 6d55250..735ab7a 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -31,7 +31,7 @@ noinst_LTLIBRARIES=libh5test_fortran.la # 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/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index 60ac23f..517a3c8 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -29,7 +29,7 @@ AM_FCFLAGS+=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLA # pass the -static flag to the library linker. # (Actually, we historically have bad luck combining shared libraries with # parallel code. But you're welcome to try...) -if HAVE_SHARED_CONDITIONAL +if FORTRAN_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif |