Mercurial > hg > octave-nkf

diff libinterp/oct-conf.in.h @ 19938:08033d583435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more consistently use _CPPFLAGS and _LDFLAGS variables * common.mk, configure.ac, toplev.cc, libinterp/dldfcn/module-files, oct-conf.in.h: Use FLTK_CPPFLAGS, FLTK_LDFLAGS, FONTCONFIG_CPPFLAGS, FT2_CPPFLAGS for consistency with other library compiler flag variables.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Feb 2015 14:33:05 -0500
parents bf25e9f7c22a
children 9f6ee9cb749c
line wrap: on
line diff
--- a/libinterp/oct-conf.in.h
+++ b/libinterp/oct-conf.in.h
@@ -278,24 +278,32 @@
 #define OCTAVE_CONF_FLIBS %OCTAVE_CONF_FLIBS%
 #endif
 
-#ifndef OCTAVE_CONF_FLTK_CFLAGS
-#define OCTAVE_CONF_FLTK_CFLAGS %OCTAVE_CONF_FLTK_CFLAGS%
+#ifndef OCTAVE_CONF_FLTK_CPPFLAGS
+#define OCTAVE_CONF_FLTK_CPPFLAGS %OCTAVE_CONF_FLTK_CPPFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_FLTK_LDFLAGS
+#define OCTAVE_CONF_FLTK_LDFLAGS %OCTAVE_CONF_FLTK_LDFLAGS%
 #endif
 
 #ifndef OCTAVE_CONF_FLTK_LIBS
 #define OCTAVE_CONF_FLTK_LIBS %OCTAVE_CONF_FLTK_LIBS%
 #endif
 
-#ifndef OCTAVE_CONF_FONTCONFIG_CFLAGS
-#define OCTAVE_CONF_FONTCONFIG_CFLAGS %OCTAVE_CONF_FONTCONFIG_CFLAGS%
+#ifndef OCTAVE_CONF_FONTCONFIG_CPPFLAGS
+#define OCTAVE_CONF_FONTCONFIG_CPPFLAGS %OCTAVE_CONF_FONTCONFIG_CPPFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_FONTCONFIG_LIBS
+#define OCTAVE_CONF_FONTCONFIG_LIBS %OCTAVE_CONF_FONTCONFIG_LIBS%
 #endif
 
 #ifndef OCTAVE_CONF_FPICFLAG
 #define OCTAVE_CONF_FPICFLAG %OCTAVE_CONF_FPICFLAG%
 #endif
 
-#ifndef OCTAVE_CONF_FT2_CFLAGS
-#define OCTAVE_CONF_FT2_CFLAGS %OCTAVE_CONF_FT2_CFLAGS%
+#ifndef OCTAVE_CONF_FT2_CPPFLAGS
+#define OCTAVE_CONF_FT2_CPPFLAGS %OCTAVE_CONF_FT2_CPPFLAGS%
 #endif
 
 #ifndef OCTAVE_CONF_FT2_LIBS