Mercurial > octave-nkf
diff Makeconf.in @ 9542:f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 18 Aug 2009 13:05:14 -0400 |
| parents | d0239bddf621 |
| children | d3fccc4c4b9e |
line wrap: on
line diff
--- a/Makeconf.in Tue Aug 18 12:11:49 2009 -0400 +++ b/Makeconf.in Tue Aug 18 13:05:14 2009 -0400 @@ -228,6 +228,9 @@ LIBCRUFT = @LIBCRUFT@ FT2_LIBS = @FT2_LIBS@ + +HDF5_CPPFLAGS = @HDF5_CPPFLAGS@ +HDF5_LDFLAGS = @HDF5_LDFLAGS@ HDF5_LIBS = @HDF5_LIBS@ Z_CPPFLAGS = @Z_CPPFLAGS@ @@ -293,7 +296,7 @@ DL_LIBS = @DL_LIBS@ LIBS = @LIBS@ -ALL_CPPFLAGS = $(CPPFLAGS) $(Z_CPPFLAGS) +ALL_CPPFLAGS = $(CPPFLAGS) $(HDF5_CPPFLAGS) $(Z_CPPFLAGS) ## Use sort to remove duplicates. SPARSE_CPPFLAGS = \ @@ -610,6 +613,8 @@ -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \ -e "s|%OCTAVE_CONF_GRAPHICS_LIBS%|\"${GRAPHICS_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ -e "s|%OCTAVE_CONF_INCFLAGS%|\"${INCFLAGS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \