summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-04-24 21:08:43 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-04-24 21:08:43 (GMT)
commit0c936cb87645f03b88801d42f7080445101b22e0 (patch)
tree32886da9bdbb378496ca23f077aaee2b2d6caa13
parent57c41e622b4123f983b6a86c982f9bbf7bdb3373 (diff)
downloadhdf5-0c936cb87645f03b88801d42f7080445101b22e0.zip
hdf5-0c936cb87645f03b88801d42f7080445101b22e0.tar.gz
hdf5-0c936cb87645f03b88801d42f7080445101b22e0.tar.bz2
[svn-r6748] Purpose:
Bug Fix Description: In parallel mode, the MPI libraries were being added to the LDFLAGS variable instead of the LIBS variable. This was playing havoc with the h5fc script (the order you specify libraries is important to some compilers). Solution: The AC_CHECK_FLIB macro was placing these libraries into the LDFLAGS instead of LIBS, which is where they should have gone. Replaced LDFLAGS with LIBS in that case. Platforms tested: Modi4 (Parallel & Fortran) Arabica (Fortran) Verbena (Fortran, no C++ since it's not affected) Ran "make check-install" after installation... Misc. update:
-rw-r--r--fortran/acsite.m46
-rwxr-xr-xfortran/configure12
2 files changed, 9 insertions, 9 deletions
diff --git a/fortran/acsite.m4 b/fortran/acsite.m4
index 74da0dc..46f69f9 100644
--- a/fortran/acsite.m4
+++ b/fortran/acsite.m4
@@ -358,15 +358,15 @@ cat >conftest.$ac_ext <<EOF
EOF
if test -n "$1"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -l$1"
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -l$1"
fi
if AC_TRY_EVAL(ac_compile) && AC_TRY_EVAL(ac_link); then
:
[$3]
else
- LDFLAGS="$saved_LDFLAGS"
+ LIBS="$saved_LIBS"
[$4]
fi
cd ..
diff --git a/fortran/configure b/fortran/configure
index 5f4949a..929ee46 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -9270,8 +9270,8 @@ cat >conftest.$ac_ext <<EOF
EOF
if test -n "mpi"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -lmpi"
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -lmpi"
fi
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -9286,7 +9286,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
:
else
- LDFLAGS="$saved_LDFLAGS"
+ LIBS="$saved_LIBS"
PARALLEL=no
fi
cd ..
@@ -9352,8 +9352,8 @@ cat >conftest.$ac_ext <<EOF
EOF
if test -n "mpio"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -lmpio"
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -lmpio"
fi
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -9368,7 +9368,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
:
else
- LDFLAGS="$saved_LDFLAGS"
+ LIBS="$saved_LIBS"
PARALLEL=no
fi
cd ..