changeset 6286:c6a7b0453f9a

[project @ 2007-02-08 19:04:38 by jwe]
author jwe
date Thu, 08 Feb 2007 19:04:38 +0000
parents 3991a9f0fead
children 3e59a46f256c
files ChangeLog configure.in scripts/ChangeLog scripts/plot/drawnow.m
diffstat 4 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 08 09:50:11 2007 +0000
+++ b/ChangeLog	Thu Feb 08 19:04:38 2007 +0000
@@ -1,3 +1,7 @@
+2007-02-08  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Rewrite if !( X ) ... fi as if X; true; else ... fi.
+
 2007-02-07  John W. Eaton  <jwe@octave.org>
 
 	* Makeconf.in (do-script-install): Use $(FCN_FILES) for list of
--- a/configure.in	Thu Feb 08 09:50:11 2007 +0000
+++ b/configure.in	Thu Feb 08 19:04:38 2007 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.553 $)
+AC_REVISION($Revision: 1.554 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1531,7 +1531,9 @@
   fi
 
   ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw 
-  if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then
+  if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then
+    true
+  else
     case "$canonical_host_type" in
       *-*-cygwin* | *-*-mingw* | *-*-msdosmsvc)
        loadlibrary_api=true;
--- a/scripts/ChangeLog	Thu Feb 08 09:50:11 2007 +0000
+++ b/scripts/ChangeLog	Thu Feb 08 19:04:38 2007 +0000
@@ -1,5 +1,9 @@
 2007-02-08  John W. Eaton  <jwe@octave.org>
 
+	* plot/drawnow.m: Use gnuplot_binary() instead of just "gnuplot"
+	and check gnuplot_use_title_option instead of just assuming -title
+	works.  From Michael Goffioul <michael.goffioul@swing.be>.
+
 	* Makefile.in (DISTFILES): Add move-if-change to the list.
 
 	* audio/Makefile.in, control/base/Makefile.in,
@@ -414,7 +418,7 @@
 
 	* sparse/normest.m: New file.
 
-2006-12-06  Michael Goffioul  <michael.goffioul@swing.be>.
+2006-12-06  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* miscellaneous/copyfile.m, miscellaneous/movefile.m:
 	Work on Windows systems without cp or mv.
--- a/scripts/plot/drawnow.m	Thu Feb 08 09:50:11 2007 +0000
+++ b/scripts/plot/drawnow.m	Thu Feb 08 19:04:38 2007 +0000
@@ -37,7 +37,11 @@
     plot_stream = f.__plot_stream__;
 
     if (isempty (plot_stream))
-      plot_stream = popen (sprintf ("gnuplot -title \"Figure %d\"", h), "w");
+      cmd = gnuplot_binary ();
+      if (gnuplot_use_title_option ())
+        cmd = sprintf ("%s -title \"Figure\" %s", cmd, h);
+      endif
+      plot_stream = popen (cmd, "w");
       if (plot_stream < 0)
 	error ("drawnow: failed to open connection to gnuplot");
       else