mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
[svn-r4166]
Purpose:
Fix
Description:
Porting fixes from the 1.4 branch to the 1.5 branch. This fixes the
dependency problem in the testpar/ directory and also the problem
with module includes on the command line.
This commit is contained in:
Bill Wendling
parent
f4da6baf5d
commit
6874139caa
@ -249,6 +249,7 @@ done
|
||||
|
||||
if test -n "$F9XMODFLAG"; then
|
||||
echo $F9XMODFLAG 1>&6
|
||||
FFLAGS="$(F9XMODFLAG). $(F9XMODFLAG)../src $FFLAGS"
|
||||
else
|
||||
echo unknown 1>&6
|
||||
fi
|
||||
|
||||
83
fortran/configure
vendored
83
fortran/configure
vendored
@ -1955,6 +1955,7 @@ done
|
||||
|
||||
if test -n "$F9XMODFLAG"; then
|
||||
echo $F9XMODFLAG 1>&6
|
||||
FFLAGS="$(F9XMODFLAG). $(F9XMODFLAG)../src $FFLAGS"
|
||||
else
|
||||
echo unknown 1>&6
|
||||
fi
|
||||
@ -1988,17 +1989,17 @@ case "$withval" in
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1992: checking for $ac_hdr" >&5
|
||||
echo "configure:1993: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1997 "configure"
|
||||
#line 1998 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -2025,7 +2026,7 @@ fi
|
||||
done
|
||||
|
||||
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2029: checking for compress in -lz" >&5
|
||||
echo "configure:2030: checking for compress in -lz" >&5
|
||||
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2033,7 +2034,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2037 "configure"
|
||||
#line 2038 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2044,7 +2045,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2074,7 +2075,7 @@ fi
|
||||
;;
|
||||
no)
|
||||
echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6
|
||||
echo "configure:2078: checking for GNU zlib" >&5
|
||||
echo "configure:2079: checking for GNU zlib" >&5
|
||||
echo "$ac_t""suppressed" 1>&6
|
||||
;;
|
||||
*)
|
||||
@ -2086,17 +2087,17 @@ echo "configure:2078: checking for GNU zlib" >&5
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2090: checking for $ac_hdr" >&5
|
||||
echo "configure:2091: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2095 "configure"
|
||||
#line 2096 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -2128,17 +2129,17 @@ done
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2132: checking for $ac_hdr" >&5
|
||||
echo "configure:2133: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2137 "configure"
|
||||
#line 2138 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -2172,7 +2173,7 @@ done
|
||||
LDFLAGS="$LDFLAGS -L$zlib_lib"
|
||||
ZLIB_DIR=$zlib_lib
|
||||
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2176: checking for compress in -lz" >&5
|
||||
echo "configure:2177: checking for compress in -lz" >&5
|
||||
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2180,7 +2181,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2184 "configure"
|
||||
#line 2185 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2191,7 +2192,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2221,7 +2222,7 @@ fi
|
||||
|
||||
else
|
||||
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2225: checking for compress in -lz" >&5
|
||||
echo "configure:2226: checking for compress in -lz" >&5
|
||||
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2229,7 +2230,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2233 "configure"
|
||||
#line 2234 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2240,7 +2241,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2329,7 +2330,7 @@ case "$CC_BASENAME" in
|
||||
mpicc)
|
||||
PARALLEL=mpicc
|
||||
echo $ac_n "checking for mpirun""... $ac_c" 1>&6
|
||||
echo "configure:2333: checking for mpirun" >&5
|
||||
echo "configure:2334: checking for mpirun" >&5
|
||||
|
||||
cmd=`echo $CC |cut -f1 -d' '`
|
||||
if (echo $cmd |grep / >/dev/null); then
|
||||
@ -2369,7 +2370,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for parallel support files""... $ac_c" 1>&6
|
||||
echo "configure:2373: checking for parallel support files" >&5
|
||||
echo "configure:2374: checking for parallel support files" >&5
|
||||
case "X-$enable_parallel" in
|
||||
X-|X-no|X-none)
|
||||
echo "$ac_t""skipped" 1>&6
|
||||
@ -2380,21 +2381,21 @@ case "X-$enable_parallel" in
|
||||
PARALLEL=yes
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2384 "configure"
|
||||
#line 2385 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6
|
||||
echo "configure:2398: checking for MPI_Init in -lmpi" >&5
|
||||
echo "configure:2399: checking for MPI_Init in -lmpi" >&5
|
||||
ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2402,7 +2403,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpi $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2406 "configure"
|
||||
#line 2407 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2413,7 +2414,7 @@ int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2446,21 +2447,21 @@ rm -f conftest*
|
||||
|
||||
if test "X$PARALLEL" = "Xyes"; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2450 "configure"
|
||||
#line 2451 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_File_open()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6
|
||||
echo "configure:2464: checking for MPI_File_open in -lmpio" >&5
|
||||
echo "configure:2465: checking for MPI_File_open in -lmpio" >&5
|
||||
ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2468,7 +2469,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpio $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2472 "configure"
|
||||
#line 2473 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2479,7 +2480,7 @@ int main() {
|
||||
MPI_File_open()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2522,7 +2523,7 @@ rm -f conftest*
|
||||
|
||||
PARALLEL=mpich
|
||||
echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
|
||||
echo "configure:2526: checking for MPI_Init in -lmpich" >&5
|
||||
echo "configure:2527: checking for MPI_Init in -lmpich" >&5
|
||||
ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2530,7 +2531,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpich $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2534 "configure"
|
||||
#line 2535 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2541,7 +2542,7 @@ int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2589,23 +2590,23 @@ EOF
|
||||
|
||||
|
||||
echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6
|
||||
echo "configure:2593: checking prefix for running on one processor" >&5
|
||||
echo "configure:2594: checking prefix for running on one processor" >&5
|
||||
echo "$ac_t""$RUNSERIAL" 1>&6
|
||||
echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6
|
||||
echo "configure:2596: checking prefix for running in parallel" >&5
|
||||
echo "configure:2597: checking prefix for running in parallel" >&5
|
||||
echo "$ac_t""$RUNPARALLEL" 1>&6
|
||||
|
||||
echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6
|
||||
echo "configure:2600: checking whether a simple MPI-IO program can be linked" >&5
|
||||
echo "configure:2601: checking whether a simple MPI-IO program can be linked" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2602 "configure"
|
||||
#line 2603 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_Init();MPI_File_open();
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6
|
||||
else
|
||||
@ -2633,7 +2634,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking make""... $ac_c" 1>&6
|
||||
echo "configure:2637: checking make" >&5
|
||||
echo "configure:2638: checking make" >&5
|
||||
|
||||
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
|
||||
sed -n 1p|cut -c1-8`" = "GNU Make"; then
|
||||
@ -2650,7 +2651,7 @@ fi
|
||||
|
||||
if test -z "$DEPEND"; then
|
||||
echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6
|
||||
echo "configure:2654: checking how to include a makefile" >&5
|
||||
echo "configure:2655: checking how to include a makefile" >&5
|
||||
|
||||
cat >makeinc <<EOF
|
||||
foo:
|
||||
|
||||
@ -17,9 +17,6 @@ TRACE=perl $(top_srcdir)/bin/trace
|
||||
## Add `-I.' to the C preprocessor flags.
|
||||
CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
|
||||
|
||||
MFLAG=@F9XMODFLAG@
|
||||
FFLAGS=$(MFLAG). @FFLAGS@
|
||||
|
||||
## This is our main target
|
||||
LIB=libhdf5_fortran.la
|
||||
DISTCLEAN=H5fortran_types.f90
|
||||
|
||||
@ -14,8 +14,6 @@ hdf5_builddir=$(top_builddir)/src
|
||||
## Add include directory to the C preprocessor flags and the h5test and hdf5
|
||||
## libraries to the library list.
|
||||
LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
|
||||
MFLAG=@F9XMODFLAG@
|
||||
FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@
|
||||
FLIB=../src/libhdf5_fortran.la
|
||||
HDF5LIB=$(hdf5_builddir)/libhdf5.la
|
||||
|
||||
|
||||
@ -14,8 +14,6 @@ hdf5_builddir=$(top_builddir)/src
|
||||
## Add the include directory to the C preprocessor flags the the hdf5 library
|
||||
## to the library list.
|
||||
LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
|
||||
MFLAG=@F9XMODFLAG@
|
||||
FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@
|
||||
LIBFORTRAN=../src/libhdf5_fortran.la
|
||||
LIBHDF5=$(hdf5_builddir)/libhdf5.la
|
||||
|
||||
@ -41,6 +39,10 @@ $(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST)
|
||||
|
||||
$(TEST_OBJ): $(TEST_HDR)
|
||||
|
||||
## Put in dependencies to the THDF5 module so that things will be built
|
||||
## in the correct order.
|
||||
thyperslab_wr.lo: $(srcdir)/thyperslab_wr.f90 thdf5.lo
|
||||
|
||||
ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo tcheck.lo ptesthdf5_fortran.lo
|
||||
@$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user