summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-09-13 22:30:33 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-09-13 22:30:33 (GMT)
commit33beeb7f55193bc76a7544f9fe3634718f36352d (patch)
tree477997f046cf9bc98025a8ecdd63ea01963d1081 /fortran/src
parent676e9e6f13caaeff5fb0e3809dda6d0e427bf0de (diff)
downloadhdf5-33beeb7f55193bc76a7544f9fe3634718f36352d.zip
hdf5-33beeb7f55193bc76a7544f9fe3634718f36352d.tar.gz
hdf5-33beeb7f55193bc76a7544f9fe3634718f36352d.tar.bz2
[svn-r11411] Purpose:
Bug fix Description: Building with --disable-static seems to have been broken on several platforms. Fixed this. Configure will now disable shared libraries automatically when using pgf90 or when building on Cygwin. Solution: To avoid errors when using shared libraries with pgf90 (which I had not realized were compiler-specific), I had manually set convenience libraries to use the -static linking flag. Apparently, this is not necessary, and caused these libraries to be created as empty archives when --disable-static was used. Also, some libraries were including other libraries, which was not necessary. I also fixed code in configure.in to correctly detect whether shared or static libraries are enabled, and moved code that disables shared libraries to before libtool is created (rather than editing libtool after the fact). Despite repeated warnings that only one shared library can be linked at a time, I have yet to have shared libraries break the linking of tests on any system. We'll see if the Daily Tests turn up anything. Platforms tested: mir (fortran, C++), sleipnir (C++), modi4 (fortran, C++, parallel), sol (fortran, C++), cygwin
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/Makefile.am3
-rw-r--r--fortran/src/Makefile.in3
2 files changed, 0 insertions, 6 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 481eb89..9b83a9d 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -26,9 +26,6 @@ AM_FCFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/fortran
AM_FCLIBS=$(LIBHDF5)
-# Fortran libraries are linked statically to solve a build problem.
-AM_LDFLAGS=-static
-
# This is our main target, the fortran library
lib_LTLIBRARIES=libhdf5_fortran.la
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index f91e7a8..ab6fb9a 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -350,9 +350,6 @@ INCLUDES = -I$(top_srcdir)/src
AM_FCFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/fortran
AM_FCLIBS = $(LIBHDF5)
-# Fortran libraries are linked statically to solve a build problem.
-AM_LDFLAGS = -static
-
# This is our main target, the fortran library
lib_LTLIBRARIES = libhdf5_fortran.la
@BUILD_PARALLEL_CONDITIONAL_FALSE@PARALLEL_COND_SRC = HDF5.f90