mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-18 15:15:56 +08:00
[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:
This commit is contained in:
parent
57c41e622b
commit
0c936cb876
@ -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 ..
|
||||
|
12
fortran/configure
vendored
12
fortran/configure
vendored
@ -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 ..
|
||||
|
Loading…
Reference in New Issue
Block a user