# HG changeset patch
# User jwe
# Date 1170965215 0
# Node ID e8c4edcfe43d601375be869904e7b1d8a13eac55
# Parent  0c6d07b9240e78a2f18225720388d57ba6ea51cf
[project @ 2007-02-08 20:06:54 by jwe]

diff -r 0c6d07b9240e -r e8c4edcfe43d ChangeLog
--- a/ChangeLog	Thu Feb 08 19:55:44 2007 +0000
+++ b/ChangeLog	Thu Feb 08 20:06:55 2007 +0000
@@ -1,6 +1,7 @@
 2007-02-08  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Rewrite if !( X ) ... fi as if X; true; else ... fi.
+	Also check for _glp_lpx_simplex.
 
 2007-02-07  John W. Eaton  <jwe@octave.org>
 
diff -r 0c6d07b9240e -r e8c4edcfe43d configure.in
--- a/configure.in	Thu Feb 08 19:55:44 2007 +0000
+++ b/configure.in	Thu Feb 08 20:06:55 2007 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.554 $)
+AC_REVISION($Revision: 1.555 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -590,11 +590,15 @@
 
 GLPK_LIBS=
 if test -n "$glpk_lib"; then
-  AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [
+  AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [
+    AC_CHECK_LIB($glpk_lib, _glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [])])
+  if test -n "$GLPK_LIBS"; then
     AC_CHECK_HEADERS(glpk.h, [
       GLPK_LIBS="-l$glpk_lib"
       AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])], [
-      glpk_missing=yes])])
+        GLPK_LIBS=
+        glpk_missing=yes])
+  fi
 fi
 AC_SUBST(GLPK_LIBS)
 if test "$glpk_missing" = yes; then
diff -r 0c6d07b9240e -r e8c4edcfe43d scripts/plot/drawnow.m
--- a/scripts/plot/drawnow.m	Thu Feb 08 19:55:44 2007 +0000
+++ b/scripts/plot/drawnow.m	Thu Feb 08 20:06:55 2007 +0000
@@ -39,7 +39,7 @@
     if (isempty (plot_stream))
       cmd = gnuplot_binary ();
       if (gnuplot_use_title_option ())
-        cmd = sprintf ("%s -title \"Figure\" %s", cmd, h);
+        cmd = sprintf ("%s -title \"Figure %d\"", cmd, h);
       endif
       plot_stream = popen (cmd, "w");
       if (plot_stream < 0)