diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-09-13 22:30:33 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-09-13 22:30:33 (GMT) |
| commit | 33beeb7f55193bc76a7544f9fe3634718f36352d (patch) | |
| tree | 477997f046cf9bc98025a8ecdd63ea01963d1081 /fortran/test/Makefile.am | |
| parent | 676e9e6f13caaeff5fb0e3809dda6d0e427bf0de (diff) | |
| download | hdf5-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/test/Makefile.am')
| -rw-r--r-- | fortran/test/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 4c9d910..079119e 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -23,11 +23,8 @@ include $(top_srcdir)/config/commence.am AM_FCFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/fortran/src -# Fortran libraries are linked statically to solve a build problem. -AM_LDFLAGS=-static - # The Fortran test library -lib_LTLIBRARIES=libh5test_fortran.la +noinst_LTLIBRARIES=libh5test_fortran.la # Our main targets, the tests themselves TEST_PROG=fortranlib_test fflush1 fflush2 @@ -49,9 +46,7 @@ fortranlib_test_SOURCES = fortranlib_test.f90 \ fflush1_SOURCES=fflush1.f90 fflush2_SOURCES=fflush2.f90 -# The fortran test library depends on the main fortran library. # The tests depend on both fortran libraries and both main libraries. -LIBADD=$(LIBH5TEST) $(LIBHDF5) $(LIBH5F) LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) # Temporary files |