Mercurial > hg > octave-lyh
changeset 2289:d9fe34ccf2bf
[project @ 1996-06-06 05:05:47 by jwe]
author | jwe |
---|---|
date | Thu, 06 Jun 1996 05:09:24 +0000 |
parents | 039cda4dc95a |
children | 9170d297145f |
files | acconfig.h configure.in src/pt-plot.cc |
diffstat | 3 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/acconfig.h +++ b/acconfig.h @@ -27,6 +27,9 @@ /* Define if your system has a single-arg prototype for gettimeofday. */ #undef GETTIMEOFDAY_NO_TZ +/* Define if your gnuplot supports multiplt plot windows with X11. */ +#undef GNUPLOT_HAS_FRAMES + /* Define if your gnuplot has mutliplot. */ #undef GNUPLOT_HAS_MULTIPLOT
--- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_REVISION($Revision: 1.206 $) +AC_REVISION($Revision: 1.207 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -991,6 +991,13 @@ else AC_MSG_RESULT([no]) fi + AC_MSG_CHECKING([to see if your gnuplot supports multiple plot windows]) + if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then + AC_MSG_RESULT([yes]) + AC_DEFINE(GNUPLOT_HAS_FRAMES, 1) + else + AC_MSG_RESULT([no]) + fi else AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) AC_MSG_WARN([installed, but you won't be able to use any of Octave's])
--- a/src/pt-plot.cc +++ b/src/pt-plot.cc @@ -69,6 +69,9 @@ // The name of the shell command to execute to start gnuplot. static string Vgnuplot_binary; +// TRUE if gnuplot appears to support multiple plot windows with X11. +static bool Vgnuplot_has_frames; + // TRUE if gnuplot appears to support multiplot. static bool Vgnuplot_has_multiplot; @@ -1085,6 +1088,14 @@ } static int +gnuplot_has_frames (void) +{ + Vgnuplot_has_frames = check_preference ("gnuplot_has_frames"); + + return 0; +} + +static int gnuplot_has_multiplot (void) { Vgnuplot_has_multiplot = check_preference ("gnuplot_has_multiplot"); @@ -1101,6 +1112,15 @@ DEFVAR (gnuplot_binary, "gnuplot", 0, gnuplot_binary, "path to gnuplot binary"); +#ifdef GNUPLOT_HAS_FRAMES + double with_frames = 1.0; +#else + double with_frames = 0.0; +#endif + + DEFVAR (gnuplot_has_frames, with_frames, 0, gnuplot_has_frames, + "true if gnuplot supports multiple plot windows on X11, false otherwise"); + #ifdef GNUPLOT_HAS_MULTIPLOT double with_multiplot = 1.0; #else