mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-12 17:31:09 +08:00
[svn-r4138]
Purpose:
Bug Fix
Description:
In order for libtool to point to the place zlib lives (when
specified) it needs to add that flag to the LDFLAGS macro. However,
since we're getting this information from the top-level configure,
it's cached. Thus, we don't check for it and the -L flag doesn't get
included into the LDFLAGS macro.
Solution:
Remove the cached value so that the Fortran configure will always
check for zlib even if it's found by the top-level configure.
Platforms tested:
Kelgia
This commit is contained in:
Bill Wendling
parent
6f5d2e89ab
commit
208e185f6a
85
fortran/configure
vendored
85
fortran/configure
vendored
@ -1971,6 +1971,9 @@ cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
|
||||
|
||||
ac_cv_lib_z_compress=""
|
||||
|
||||
# Check whether --with-zlib or --without-zlib was given.
|
||||
if test "${with_zlib+set}" = set; then
|
||||
withval="$with_zlib"
|
||||
@ -1985,17 +1988,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:1989: checking for $ac_hdr" >&5
|
||||
echo "configure:1992: 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 1994 "configure"
|
||||
#line 1997 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2002: \"$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*
|
||||
@ -2022,7 +2025,7 @@ fi
|
||||
done
|
||||
|
||||
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2026: checking for compress in -lz" >&5
|
||||
echo "configure:2029: 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
|
||||
@ -2030,7 +2033,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2034 "configure"
|
||||
#line 2037 "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
|
||||
@ -2041,7 +2044,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2048: \"$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
|
||||
@ -2071,7 +2074,7 @@ fi
|
||||
;;
|
||||
no)
|
||||
echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6
|
||||
echo "configure:2075: checking for GNU zlib" >&5
|
||||
echo "configure:2078: checking for GNU zlib" >&5
|
||||
echo "$ac_t""suppressed" 1>&6
|
||||
;;
|
||||
*)
|
||||
@ -2083,17 +2086,17 @@ echo "configure:2075: 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:2087: checking for $ac_hdr" >&5
|
||||
echo "configure:2090: 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 2092 "configure"
|
||||
#line 2095 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2100: \"$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*
|
||||
@ -2125,17 +2128,17 @@ done
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2129: checking for $ac_hdr" >&5
|
||||
echo "configure:2132: 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 2134 "configure"
|
||||
#line 2137 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2142: \"$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*
|
||||
@ -2169,7 +2172,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:2173: checking for compress in -lz" >&5
|
||||
echo "configure:2176: 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
|
||||
@ -2177,7 +2180,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2181 "configure"
|
||||
#line 2184 "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
|
||||
@ -2188,7 +2191,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2195: \"$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
|
||||
@ -2218,7 +2221,7 @@ fi
|
||||
|
||||
else
|
||||
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2222: checking for compress in -lz" >&5
|
||||
echo "configure:2225: 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
|
||||
@ -2226,7 +2229,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2230 "configure"
|
||||
#line 2233 "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
|
||||
@ -2237,7 +2240,7 @@ int main() {
|
||||
compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2244: \"$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
|
||||
@ -2326,7 +2329,7 @@ case "$CC_BASENAME" in
|
||||
mpicc)
|
||||
PARALLEL=mpicc
|
||||
echo $ac_n "checking for mpirun""... $ac_c" 1>&6
|
||||
echo "configure:2330: checking for mpirun" >&5
|
||||
echo "configure:2333: checking for mpirun" >&5
|
||||
|
||||
cmd=`echo $CC |cut -f1 -d' '`
|
||||
if (echo $cmd |grep / >/dev/null); then
|
||||
@ -2366,7 +2369,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for parallel support files""... $ac_c" 1>&6
|
||||
echo "configure:2370: checking for parallel support files" >&5
|
||||
echo "configure:2373: checking for parallel support files" >&5
|
||||
case "X-$enable_parallel" in
|
||||
X-|X-no|X-none)
|
||||
echo "$ac_t""skipped" 1>&6
|
||||
@ -2377,21 +2380,21 @@ case "X-$enable_parallel" in
|
||||
PARALLEL=yes
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2381 "configure"
|
||||
#line 2384 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2391: \"$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:2395: checking for MPI_Init in -lmpi" >&5
|
||||
echo "configure:2398: 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
|
||||
@ -2399,7 +2402,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpi $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2403 "configure"
|
||||
#line 2406 "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
|
||||
@ -2410,7 +2413,7 @@ int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2417: \"$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
|
||||
@ -2443,21 +2446,21 @@ rm -f conftest*
|
||||
|
||||
if test "X$PARALLEL" = "Xyes"; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2447 "configure"
|
||||
#line 2450 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_File_open()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2457: \"$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:2461: checking for MPI_File_open in -lmpio" >&5
|
||||
echo "configure:2464: 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
|
||||
@ -2465,7 +2468,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpio $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2469 "configure"
|
||||
#line 2472 "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
|
||||
@ -2476,7 +2479,7 @@ int main() {
|
||||
MPI_File_open()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2483: \"$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
|
||||
@ -2519,7 +2522,7 @@ rm -f conftest*
|
||||
|
||||
PARALLEL=mpich
|
||||
echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
|
||||
echo "configure:2523: checking for MPI_Init in -lmpich" >&5
|
||||
echo "configure:2526: 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
|
||||
@ -2527,7 +2530,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmpich $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2531 "configure"
|
||||
#line 2534 "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
|
||||
@ -2538,7 +2541,7 @@ int main() {
|
||||
MPI_Init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2545: \"$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
|
||||
@ -2586,23 +2589,23 @@ EOF
|
||||
|
||||
|
||||
echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6
|
||||
echo "configure:2590: checking prefix for running on one processor" >&5
|
||||
echo "configure:2593: 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:2593: checking prefix for running in parallel" >&5
|
||||
echo "configure:2596: 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:2597: checking whether a simple MPI-IO program can be linked" >&5
|
||||
echo "configure:2600: checking whether a simple MPI-IO program can be linked" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2599 "configure"
|
||||
#line 2602 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
MPI_Init();MPI_File_open();
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2609: \"$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
|
||||
@ -2630,7 +2633,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking make""... $ac_c" 1>&6
|
||||
echo "configure:2634: checking make" >&5
|
||||
echo "configure:2637: checking make" >&5
|
||||
|
||||
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
|
||||
sed -n 1p|cut -c1-8`" = "GNU Make"; then
|
||||
@ -2647,7 +2650,7 @@ fi
|
||||
|
||||
if test -z "$DEPEND"; then
|
||||
echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6
|
||||
echo "configure:2651: checking how to include a makefile" >&5
|
||||
echo "configure:2654: checking how to include a makefile" >&5
|
||||
|
||||
cat >makeinc <<EOF
|
||||
foo:
|
||||
|
||||
@ -252,6 +252,13 @@ dnl Is the GNU zlib present? It has a header file `zlib.h' and a library
|
||||
dnl `-lz' and their locations might be specified with the `--enable-zlib'
|
||||
dnl command-line switch. The value is an include path and/or a library path.
|
||||
dnl If the library path is specified then it must be preceded by a comma.
|
||||
|
||||
dnl If the presence of zlib is already cached by the top-level configure,
|
||||
dnl then "uncache" it so that we will go through this logic in any case.
|
||||
dnl Some systems where you need to specify exactly where the zlib is need
|
||||
dnl this.
|
||||
ac_cv_lib_z_compress=""
|
||||
|
||||
AC_ARG_WITH(zlib,[ --with-zlib=INC,LIB Use the GNU zlib compression],
|
||||
,withval=yes)
|
||||
case "$withval" in
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user