Mercurial > hg > octave-nkf

diff libinterp/oct-conf.in.h @ 19937:bf25e9f7c22a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS * common.mk, configure.ac, toplev.cc, __osmesa_print__.cc, libinterp/dldfcn/module-files, oct-conf.in.h: Use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Feb 2015 14:10:46 -0500
parents 4197fc428c7d
children 08033d583435
line wrap: on
line diff
--- a/libinterp/oct-conf.in.h
+++ b/libinterp/oct-conf.in.h
@@ -278,6 +278,14 @@
 #define OCTAVE_CONF_FLIBS %OCTAVE_CONF_FLIBS%
 #endif
 
+#ifndef OCTAVE_CONF_FLTK_CFLAGS
+#define OCTAVE_CONF_FLTK_CFLAGS %OCTAVE_CONF_FLTK_CFLAGS%
+#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%
 #endif
@@ -310,14 +318,6 @@
 #define OCTAVE_CONF_GNUPLOT %OCTAVE_CONF_GNUPLOT%
 #endif
 
-#ifndef OCTAVE_CONF_GRAPHICS_CFLAGS
-#define OCTAVE_CONF_GRAPHICS_CFLAGS %OCTAVE_CONF_GRAPHICS_CFLAGS%
-#endif
-
-#ifndef OCTAVE_CONF_GRAPHICS_LIBS
-#define OCTAVE_CONF_GRAPHICS_LIBS %OCTAVE_CONF_GRAPHICS_LIBS%
-#endif
-
 #ifndef OCTAVE_CONF_HDF5_CPPFLAGS
 #define OCTAVE_CONF_HDF5_CPPFLAGS %OCTAVE_CONF_HDF5_CPPFLAGS%
 #endif