diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-19 17:18:50 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-19 17:18:50 (GMT) |
| commit | 974e97e08d0a874a4b15fb0fea8e00bfb439e3d8 (patch) | |
| tree | 9974947782fe3b8954b0168f674f6cdb8f1b22a2 /configure.in | |
| parent | 4ba07597004f0d6ec4a9d141a08d70c475e1a667 (diff) | |
| download | hdf5-974e97e08d0a874a4b15fb0fea8e00bfb439e3d8.zip hdf5-974e97e08d0a874a4b15fb0fea8e00bfb439e3d8.tar.gz hdf5-974e97e08d0a874a4b15fb0fea8e00bfb439e3d8.tar.bz2 | |
[svn-r3450] Purpose:
Update
Description:
Added support for the h4toh5test program. It needs to be
conditionally compiled if HDF4 is included.
Platforms tested:
Linux
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/configure.in b/configure.in index fec2e4a..917fea3 100644 --- a/configure.in +++ b/configure.in @@ -521,21 +521,22 @@ AC_SUBST(H5TOH4) H5TOH4=h5toh4 AC_SUBST(TESTH5TOH4) TESTH5TOH4='$(srcdir)/testh5toh4.sh' AC_SUBST(H4TOH5) H4TOH5=h4toh5 +AC_SUBST(H4TOH5TEST) H4TOH5TEST=h4toh5test AC_SUBST(TESTH4TOH5) TESTH4TOH5='$(srcdir)/testh4toh5.sh' AC_ARG_WITH(hdf4,[ --with-hdf4=INC,LIB Use the HDF4 library],,withval=no) case "$withval" in yes) - AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) + AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) ;; no) AC_MSG_CHECKING(for HDF4) AC_MSG_RESULT(suppressed) - unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5 + unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5 ;; *) hdf4_inc="`echo $withval |cut -f1 -d,`" @@ -544,7 +545,7 @@ case "$withval" in CPPFLAGS="$CPPFLAGS -I$hdf4_inc" AC_CHECK_HEADERS(mfhdf.h,, CPPFLAGS="$saved_CPPFLAGS" - unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) + unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) else AC_CHECK_HEADERS(mfhdf.h) fi @@ -553,13 +554,13 @@ case "$withval" in if test -n "$hdf4_lib"; then saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$hdf4_lib" - AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) + AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) else - AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) - AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 TESTH4TOH5) + AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) + AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5) AC_CHECK_LIB(df,Hstartaccess) AC_CHECK_LIB(mfhdf,SDstart) fi |