Mercurial > octave
annotate libinterp/corefcn/oct-hdf5.h @ 19277:18a3eaf7bdf0
make --with-PKG-includedir and --with-PKG-libdir configure options work again
* common.mk (ALL_CPPFLAGS): Delete unused variable.
* liboctave/Makefile.am, libcruft/Makefile.am (AM_CPPFLAGS):
Append relevant individual PKG_CPPFLAGS variables.
* oct-hdf5.h: Check HAVE_HDF5_H instead of HAVE_HDF5 to decide whether
to include hdf5.h.
* libgui/graphics/module.mk (graphics_libgui_graphics_la_CPPFLAGS):
Include HDF5_CPPFLAGS in the list.
* libgui/src/module.mk (graphics_libgui_src_la_CPPFLAGS): Include
HDF5_CPPFLAGS in the list.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 21 Oct 2014 14:37:44 -0400 |
| parents | ebb3ef964372 |
| children | 4197fc428c7d |
| rev | line source |
|---|---|
| 8676 | 1 /* |
| 2 | |
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
16892
diff
changeset
|
3 Copyright (C) 2009-2013 John W. Eaton |
| 8676 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 3 of the License, or (at your | |
| 10 option) any later version. | |
| 11 | |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with Octave; see the file COPYING. If not, see | |
| 19 <http://www.gnu.org/licenses/>. | |
| 20 | |
| 21 */ | |
| 22 | |
|
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
23 #if !defined (octave_oct_hdf5_h) |
| 8676 | 24 #define octave_hdf5_h 1 |
| 25 | |
|
19277
18a3eaf7bdf0
make --with-PKG-includedir and --with-PKG-libdir configure options work again
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
26 #if defined (HAVE_HDF5_H) |
| 8676 | 27 #include <hdf5.h> |
| 28 #endif | |
| 29 | |
| 30 #endif |