diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-13 20:12:27 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-13 20:12:27 (GMT) |
| commit | e5451a115739b034cfef5ab1669cf1bc8d7bc476 (patch) | |
| tree | b0895237dc45d428a916e77b49aef2b17f1f3554 /configure.in | |
| parent | 156200d908b2ec8a5247feffb8922f48d7794923 (diff) | |
| download | hdf5-e5451a115739b034cfef5ab1669cf1bc8d7bc476.zip hdf5-e5451a115739b034cfef5ab1669cf1bc8d7bc476.tar.gz hdf5-e5451a115739b034cfef5ab1669cf1bc8d7bc476.tar.bz2 | |
[svn-r4337]
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/configure.in b/configure.in index e516808..895f7a6 100644 --- a/configure.in +++ b/configure.in @@ -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 |