Mercurial > octave-nkf
changeset 9543:1d51ab34b509
tweaks for HDF5 library check
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 18 Aug 2009 15:28:55 -0400 |
| parents | f5ec5dc66824 |
| children | df0abc63c230 |
| files | ChangeLog aclocal.m4 configure.in |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 18 13:05:14 2009 -0400 +++ b/ChangeLog Tue Aug 18 15:28:55 2009 -0400 @@ -1,10 +1,17 @@ +2009-08-18 John W. Eaton <jwe@octave.org> + + * aclocal.m4 (OCTAVE_HDF5_HAS_REQUIRED_API): If test fails, set + octave_hdf5_ok to no instead of setting HAVE_HDF5 to false. + * configure.in: Check octave_hdf5_ok instead of HAVE_HDF5. + Set TEXINFO_HDF5 if HDF5 library is found. + 2009-08-18 John W. Eaton <jwe@octave.org> * Makeconf.in (ALL_CPPFLAGS): Add HDF5_CPPFLAGS to the list. * aclocal.m4 (OCTAVE_HDF5_HAS_REQUIRED_API): Set HAVE_HDF5 to false, not WITH_HDF5. * configure.in: Use OCTAVE_CHECK_LIBRARY to check for HDF5 - library. Print HDF5_CPPFLAGS and HDF5_LDFLAGLS in the summary. + library. Print HDF5_CPPFLAGS and HDF5_LDFLAGS in the summary. * octave-bug.in, octave-bug.cc.in, Makeconf.in: Substitute HDF5_CPPFLAGS and HDF5_LDFLAGS.
--- a/aclocal.m4 Tue Aug 18 13:05:14 2009 -0400 +++ b/aclocal.m4 Tue Aug 18 15:28:55 2009 -0400 @@ -1012,7 +1012,7 @@ octave_cv_hdf5_has_required_api=yes], [ octave_cv_hdf5_has_required_api=no])]) if test "$octave_cv_hdf5_has_required_api" = "no"; then - HAVE_HDF5=false + octave_hdf5_ok=no warn_hdf5="HDF5 library does not provide the version 1.6 API. Octave will not be able to save or load HDF5 data files." AC_MSG_WARN($warn_hdf5) fi
--- a/configure.in Tue Aug 18 13:05:14 2009 -0400 +++ b/configure.in Tue Aug 18 15:28:55 2009 -0400 @@ -505,7 +505,8 @@ [hdf5.h], [H5Gget_num_objs], [], [], [warn_hdf5= OCTAVE_HDF5_HAS_REQUIRED_API - if test $HAVE_HDF5; then + if test $octave_hdf5_ok = yes; then + TEXINFO_HDF5="@set HAVE_HDF5" AC_DEFINE(HAVE_HDF5, 1, [Define if HDF5 is available.]) AC_DEFINE(HAVE_H5GGET_NUM_OBJS, 1, [Define if HDF5 has H5Gget_num_objs.]) case "$canonical_host_type" in