Mercurial > hg > octave-thorsten
comparison acinclude.m4 @ 9892:ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
author | Kacper Kowalik <xarthisius.kk@gmail.com> |
---|---|
date | Tue, 01 Dec 2009 00:49:07 +0100 |
parents | 763906db555e |
children | f0f7c2477cdb |
comparison
equal
deleted
inserted
replaced
9891:1506a17832c9 | 9892:ac69e6f4b33d |
---|---|
1057 AC_DEFINE(_HDF5USEDLL_, 1, [Define if using HDF5 dll (Win32)]) | 1057 AC_DEFINE(_HDF5USEDLL_, 1, [Define if using HDF5 dll (Win32)]) |
1058 fi]) | 1058 fi]) |
1059 dnl | 1059 dnl |
1060 dnl Check whether HDF5 library has version 1.6 API functions. | 1060 dnl Check whether HDF5 library has version 1.6 API functions. |
1061 dnl | 1061 dnl |
1062 AC_DEFUN([OCTAVE_HDF5_HAS_REQUIRED_API], [ | 1062 AC_DEFUN([OCTAVE_HDF5_HAS_ENFORCED_16_API], [ |
1063 AC_CACHE_CHECK([whether HDF5 library has required API], | 1063 AC_CACHE_CHECK([whether HDF5 library has enforced version 1.6 API], |
1064 octave_cv_hdf5_has_required_api, [ | 1064 octave_cv_hdf5_has_enforced_16_api, [ |
1065 AC_TRY_LINK([ | 1065 AC_TRY_LINK([ |
1066 #define H5_USE_16_API 1 | |
1067 #include <hdf5.h> | 1066 #include <hdf5.h> |
1068 ], [ | 1067 ], [ |
1069 H5Eset_auto (0, 0);], [ | 1068 H5Eset_auto (0, 0);], [ |
1070 octave_cv_hdf5_has_required_api=yes], [ | 1069 octave_cv_hdf5_has_enforced_16_api=yes], [ |
1071 octave_cv_hdf5_has_required_api=no])]) | 1070 octave_cv_hdf5_has_enforced_16_api=no])]) |
1072 if test "$octave_cv_hdf5_has_required_api" = "no"; then | 1071 if test "$octave_cv_hdf5_has_enforced_16_api" != "yes"; then |
1073 octave_hdf5_ok=no | 1072 AC_DEFINE(HAVE_HDF5_18, 1, [Define if >=HDF5-1.8 is available.]) |
1074 warn_hdf5="HDF5 library does not provide the version 1.6 API. Octave will not be able to save or load HDF5 data files." | |
1075 AC_MSG_WARN($warn_hdf5) | |
1076 fi | 1073 fi |
1077 ]) | 1074 ]) |
1078 dnl | 1075 dnl |
1079 dnl Check for the QHull version. | 1076 dnl Check for the QHull version. |
1080 dnl | 1077 dnl |