Mercurial > octave-nkf

diff libinterp/corefcn/gl2ps-renderer.h @ 17797:06a850f83dd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Remove embedded gl2ps. Require gl2ps as external dependency. * NEWS: Announce that gl2ps is no longer distributed with Octave. * build-aux/common.mk: New AC_SUBST macro GL2PS_LIBS. * configure.ac: When building native graphics, test for gl2ps.h header. If not found, print a warning and disable printing of FLTK figures. * libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h: Only compile files if HAVE_GL2PS_H is true. * libinterp/dldfcn/__init_fltk__.cc(draw): Use #ifdef HAVE_GL2PS_H to either print figure, or issue a warning when gl2ps is not available. * libinterp/link-deps.mk: Add GL2PS_LIBS to libinter link dependencies * libinterp/corefcn/module.mk: Remove gl2ps.h, gl2ps.c from build system. * libinterp/corefcn/gl2ps.c, libinterp/corefcn/gl2ps.h: Removed from distribution.
author Rik <rik@octave.org>
date Tue, 29 Oct 2013 15:16:23 -0700
parents 175b392e91fe
children ebb3ef964372
line wrap: on
line diff
--- a/libinterp/corefcn/gl2ps-renderer.h	Tue Oct 29 16:29:46 2013 -0400
+++ b/libinterp/corefcn/gl2ps-renderer.h	Tue Oct 29 15:16:23 2013 -0700
@@ -23,8 +23,10 @@
 #if !defined (gl2ps_renderer_h)
 #define gl2ps_renderer_h 1
 
+#ifdef HAVE_GL2PS_H
+
 #include "gl-render.h"
-#include "gl2ps.h"
+#include <gl2ps.h>
 
 class
 OCTINTERP_API
@@ -82,4 +84,6 @@
   std::string fontname;
 };
 
+#endif  // HAVE_GL2PS_H
+
 #endif