diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2005-01-19 01:57:44 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2005-01-19 01:57:44 (GMT) |
| commit | a067f223455fa59e2107b65efaa14b1abf58e0f4 (patch) | |
| tree | abb4c638342ba779e0bd19ef0507578259096430 | |
| parent | d6c70331d748cefa9b048c7b87ea17c86e149834 (diff) | |
| download | hdf5-a067f223455fa59e2107b65efaa14b1abf58e0f4.zip hdf5-a067f223455fa59e2107b65efaa14b1abf58e0f4.tar.gz hdf5-a067f223455fa59e2107b65efaa14b1abf58e0f4.tar.bz2 | |
[svn-r9835] Purpose: Bug fix/enhancement
Description: Fortran module search directories included ../src and
../../fortran/src directories; this was defined in
acsite.m4 file in order for fortran and HL fortran tests
to compile. Those flags were included in h5fc and h5pfc scripts.
Solution: Removed those directories from acsite.m4 file and updated
Makefile.in files.
Platforms tested: sequential on arabica and parallel on copper
including HL Fortran
Misc. update:
| -rw-r--r-- | acsite.m4 | 2 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 1 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 1 |
4 files changed, 4 insertions, 1 deletions
@@ -261,7 +261,7 @@ done if test -n "$F9XMODFLAG"; then echo $F9XMODFLAG 1>&6 - FFLAGS="$F9XMODFLAG. $F9XMODFLAG../src $F9XMODFLAG../../../fortran/src $FFLAGS" + FFLAGS="$F9XMODFLAG. $FFLAGS" else echo unknown 1>&6 fi diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 0cd17e6..1d82c28 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -23,6 +23,7 @@ HDF_FORTRAN="yes" hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ +FSEARCH_DIRS =@F9XMODFLAG@../src @FSEARCH_DIRS@ ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 863da35..916c021 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -28,6 +28,7 @@ LIBFORTRAN=../src/libhdf5_fortran.la LIBHDF5=$(hdf5_builddir)/libhdf5.la FTLIB=../test/libh5test_fortran.la CTLIB=../../test/libh5test.la +FSEARCH_DIRS =@F9XMODFLAG@../src @FSEARCH_DIRS@ ## These tests are parallel RUNTEST=$(RUNPARALLEL) diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 20c8fe2..87d433a 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -23,6 +23,7 @@ HDF_FORTRAN="yes" hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ +FSEARCH_DIRS =@F9XMODFLAG@../src @F9XMODFLAG@../../fortran/src @FSEARCH_DIRS@ ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. |