changeset 10035:66d56fb7cbb8

wrapper for gl2ps.c so config.h is included before oter headers
author John W. Eaton <jwe@octave.org>
date Sun, 27 Dec 2009 21:39:44 -0500
parents 439c7a9d0fca
children 0cabc95f0833
files src/ChangeLog src/Makefile.am src/xgl2ps.c
diffstat 3 files changed, 38 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Dec 27 22:07:17 2009 +0100
+++ b/src/ChangeLog	Sun Dec 27 21:39:44 2009 -0500
@@ -1,3 +1,9 @@
+2009-12-27  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (xgl2ps.c): New file.
+	(EXTRA_DIST): Include gl2ps.c in the list.
+	(DIST_SRC): Include xgl2ps.c in the list instead of gl2ps.c.
+
 2009-12-27  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov.cc (decode_subscripts): Move to utils.cc.
--- a/src/Makefile.am	Sun Dec 27 22:07:17 2009 +0100
+++ b/src/Makefile.am	Sun Dec 27 21:39:44 2009 -0500
@@ -73,6 +73,7 @@
   DOCSTRINGS \
   find-defun-files.sh \
   genprops.awk \
+  gl2ps.c \
   graphics.h.in \
   mk-errno-list \
   mk-pkg-add \
@@ -394,7 +395,6 @@
   error.cc \
   file-io.cc \
   gl-render.cc \
-  gl2ps.c \
   gl2ps-renderer.cc \
   graphics.cc \
   gripes.cc \
@@ -444,6 +444,7 @@
   utils.cc \
   variables.cc \
   xdiv.cc \
+  xgl2ps.c \
   xnorm.cc \
   xpow.cc \
   zfstream.cc \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xgl2ps.c	Sun Dec 27 21:39:44 2009 -0500
@@ -0,0 +1,30 @@
+/*
+
+Copyright (C) 2009 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+// Wrapper for "imported" file gl2ps.c so that config.h will be included
+// before any other system or gnulib headers.
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gl2ps.c"