diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-03 15:42:15 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-03 15:42:15 (GMT) |
| commit | 8a528170ec8335e870aad2c795a6d7b751015250 (patch) | |
| tree | 3ecd894999a8b0bb2492ae2e01816b0134b300d0 /hl/fortran | |
| parent | cbf280a22d2f5aa378cb6faeef28b324b1c8ada5 (diff) | |
| download | hdf5-8a528170ec8335e870aad2c795a6d7b751015250.zip hdf5-8a528170ec8335e870aad2c795a6d7b751015250.tar.gz hdf5-8a528170ec8335e870aad2c795a6d7b751015250.tar.bz2 | |
[svn-r26117] Autotools work HDFFV-9067,
Removed restiction of disabling shared libraries on the MAC, H5_FORTRAN_SHARED was replaced with HAVE_SHARED_CONDITIONAL since H5_FORTRAN_SHARED was removed.
tested: jam
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/src/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index c8c4541..a540a36 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 FORTRAN_SHARED_CONDITIONAL +if HAVE_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index fa3a803..3671cdc 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 FORTRAN_SHARED_CONDITIONAL +if HAVE_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif |