mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-13 16:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r4337]

Browse Source 
Purpose:
    Bug Fix
Description:
    The new way of determining directory information for HDF4 and ZLIB
    bombed on me.
Solution:
    For some reason, the way I was linking together all of the
    "CHECK_LIBRARY" macros wasn't working. I separated them.
Platforms tested:
    Kelgia.
This commit is contained in:
Bill Wendling 2001-08-13 15:12:27 -05:00
parent 156200d908
commit e5451a1157
2 changed files with 451 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

798
configure vendored
View File

File diff suppressed because it is too large Load Diff

40
configure.in
View File

@ -624,14 +624,16 @@ AC_ARG_WITH(hdf4,
case "$withval" in
yes)
failed="no"
AC_CHECK_LIB(z, compress,
AC_CHECK_LIB(jpeg, jpeg_start_compress,
AC_CHECK_LIB(df, Hstartaccess,
AC_CHECK_LIB(mfhdf, SDstart,,
failed="yes"),
failed="yes"),
failed="yes"),
failed="yes")
AC_CHECK_LIB(z, compress,, failed="yes")
if test "$failed" = "no"; then
AC_CHECK_LIB(jpeg, jpeg_start_compress,, failed="yes")
fi
if test "$failed" = "no"; then
AC_CHECK_LIB(df, Hstartaccess,, failed="yes")
fi
if test "$failed" = "no"; then
AC_CHECK_LIB(mfhdf, SDstart,, failed="yes")
fi
if test "$failed" = "yes"; then
unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5
@ -662,22 +664,24 @@ case "$withval" in
CPPFLAGS="$CPPFLAGS -I$hdf4_inc"
fi
failed=no
failed="no"
AC_CHECK_HEADERS(mfhdf.h,, failed="yes")
if test -n "$hdf4_lib"; then
LDFLAGS="$LDFLAGS -L$hdf4_lib"
fi
if test "$failed" != "yes"; then
AC_CHECK_LIB(z, compress,
AC_CHECK_LIB(jpeg, jpeg_start_compress,
AC_CHECK_LIB(df, Hstartaccess,
AC_CHECK_LIB(mfhdf, SDstart,,
failed="yes"),
failed="yes"),
failed="yes"),
failed="yes")
if test "$failed" = "no"; then
AC_CHECK_LIB(z, compress,, failed="yes")
fi
if test "$failed" = "no"; then
AC_CHECK_LIB(jpeg, jpeg_start_compress,, failed="yes")
fi
if test "$failed" = "no"; then
AC_CHECK_LIB(df, Hstartaccess,, failed="yes")
fi
if test "$failed" = "no"; then
AC_CHECK_LIB(mfhdf, SDstart,, failed="yes")
fi
if test "$failed" = "yes"; then