Mercurial > hg > octave-nkf

changeset 19469:18a3eaf7bdf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1fa328da03ef
children 6ca096827123
files build-aux/common.mk libgui/graphics/module.mk libgui/src/module.mk libinterp/Makefile.am libinterp/corefcn/oct-hdf5.h liboctave/Makefile.am
diffstat 6 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/common.mk
+++ b/build-aux/common.mk
@@ -113,7 +113,6 @@
 XTRA_CFLAGS = @XTRA_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
 AM_CFLAGS = $(XTRA_CFLAGS)
-ALL_CPPFLAGS = $(CPPFLAGS) $(HDF5_CPPFLAGS) $(Z_CPPFLAGS) $(LLVM_CPPFLAGS)
 
 BUILD_CC = @BUILD_CC@
 BUILD_CFLAGS = @BUILD_CFLAGS@
--- a/libgui/graphics/module.mk
+++ b/libgui/graphics/module.mk
@@ -110,8 +110,9 @@
 
 graphics_libgui_graphics_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
-  $(FT2_CFLAGS) \
+  $(FT2_CPPFLAGS) \
   $(FONTCONFIG_CPPFLAGS) \
+  $(HDF5_CPPFLAGS) \
   @OCTGUI_DLL_DEFS@ \
   @QT_CPPFLAGS@ \
   -Igraphics -I$(srcdir)/graphics \
--- a/libgui/src/module.mk
+++ b/libgui/src/module.mk
@@ -176,8 +176,9 @@
 
 src_libgui_src_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
-  $(FT2_CFLAGS) \
+  $(FT2_CPPFLAGS) \
   $(FONTCONFIG_CPPFLAGS) \
+  $(HDF5_CPPFLAGS) \
   @OCTGUI_DLL_DEFS@ \
   @QT_CPPFLAGS@ \
   -I$(srcdir)/qterminal/libqterminal \
--- a/libinterp/Makefile.am
+++ b/libinterp/Makefile.am
@@ -32,7 +32,12 @@
   -I$(srcdir)/operators \
   -Iparse-tree -I$(srcdir)/parse-tree \
   -Icorefcn -I$(srcdir)/corefcn \
-  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \
+  $(FT2_CPPFLAGS) \
+  $(HDF5_CPPFLAGS) \
+  $(Z_CPPFLAGS) \
+  $(FFTW_XCPPFLAGS) \
+  $(LLVM_CPPFLAGS)
 
 AM_CFLAGS += $(WARN_CFLAGS)
 
--- a/libinterp/corefcn/oct-hdf5.h
+++ b/libinterp/corefcn/oct-hdf5.h
@@ -23,7 +23,7 @@
 #if !defined (octave_oct_hdf5_h)
 #define octave_hdf5_h 1
 
-#if defined (HAVE_HDF5)
+#if defined (HAVE_HDF5_H)
 #include <hdf5.h>
 #endif
 
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -28,7 +28,12 @@
   -Ioperators -I$(srcdir)/operators \
   -I$(srcdir)/system \
   -I$(srcdir)/util \
-  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \
+  $(CURL_CPPFLAGS) \
+  $(SPARSE_XCPPFLAGS) \
+  $(ARPACK_CPPFLAGS) \
+  $(QRUPDATE_CPPFLAGS) \
+  $(FFTW_XCPPFLAGS)
 
 AM_CFLAGS += $(WARN_CFLAGS)