Mercurial > octave-nkf

diff libinterp/corefcn/toplev.cc @ 17816:e6317049225b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS. * build-aux/common.mk: New alias FONTCONFIG_CPPFLAGS for FONTCONFIG_CFLAGS. Add FONTCONFIG_CFLAGS to build variables. New alias FT2_CPPFLAGS for FT2_CFLAGS * configure.ac: Don't add FT2_CFLAGS and FONTCONFIG_CFLAGS to XTRA_CXXFLAGS variable. * libinterp/Makefile.am: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to rule that creates *.df file from *.cc file. * libinterp/corefcn/module.mk: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to corefcn convenience library CPPFLAGS. * libinterp/corefcn/toplev.cc: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable. * libinterp/dldfcn/module-files: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to __init_gnuplot__.cc build. This is required because of #include "graphics.h". * libinterp/oct-conf.in.h: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable.
author Rik <rik@octave.org>
date Thu, 31 Oct 2013 13:13:25 -0700
parents 175b392e91fe
children 82c94987abc6
line wrap: on
line diff
--- a/libinterp/corefcn/toplev.cc	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/corefcn/toplev.cc	Thu Oct 31 13:13:25 2013 -0700
@@ -1298,6 +1298,7 @@
     { false, "FFTW3F_LDFLAGS", OCTAVE_CONF_FFTW3F_LDFLAGS },
     { false, "FFTW3F_LIBS", OCTAVE_CONF_FFTW3F_LIBS },
     { false, "FLIBS", OCTAVE_CONF_FLIBS },
+    { false, "FONTCONFIG_CFLAGS", OCTAVE_CONF_FONTCONFIG_CFLAGS },
     { false, "FPICFLAG", OCTAVE_CONF_FPICFLAG },
     { false, "FT2_CFLAGS", OCTAVE_CONF_FT2_CFLAGS },
     { false, "FT2_LIBS", OCTAVE_CONF_FT2_LIBS },