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 /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 '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 a4b3843..e5db074 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 FORTRAN_SHARED_CONDITIONAL +if HAVE_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 735ab7a..6d55250 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 FORTRAN_SHARED_CONDITIONAL +if HAVE_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index 517a3c8..60ac23f 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 FORTRAN_SHARED_CONDITIONAL +if HAVE_SHARED_CONDITIONAL else AM_LDFLAGS+=-static endif |