Mercurial > octave-nkf
changeset 6804:4d3fa8841006
[project @ 2007-07-26 18:44:06 by jwe]
| author | jwe |
|---|---|
| date | Thu, 26 Jul 2007 18:44:07 +0000 |
| parents | fe19c6cb5bc6 |
| children | 41d8841124b3 |
| files | ChangeLog configure.in src/ChangeLog src/DLD-FUNCTIONS/__glpk__.cc |
| diffstat | 4 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 26 18:04:06 2007 +0000 +++ b/ChangeLog Thu Jul 26 18:44:07 2007 +0000 @@ -1,3 +1,7 @@ +2007-07-26 John W. Eaton <jwe@octave.org> + + * configure.in: Also look for glpk/glpk.h. + 2007-07-25 David Bateman <dbateman@free.fr> * octMakefile.in, dlfcn/Makefile.in, emacs/Makefile.in,
--- a/configure.in Thu Jul 26 18:04:06 2007 +0000 +++ b/configure.in Thu Jul 26 18:44:07 2007 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.568 $) +AC_REVISION($Revision: 1.569 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -582,6 +582,7 @@ with_glpk=$withval, with_glpk=yes) glpk_lib= +glpk_missing=no if test "$with_glpk" = yes; then glpk_lib="glpk" elif test "$with_glpk" != no; then @@ -597,7 +598,8 @@ AC_DEFINE(GLPK_PRE_4_14, 1, [Define if GLPK version is less than 4.14.])], [ AC_CHECK_LIB($glpk_lib, _glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [])]) if test -n "$GLPK_LIBS"; then - AC_CHECK_HEADERS(glpk.h, [ + AC_CHECK_HEADERS([glpk/glpk.h glpk.h], [ + glpk_missing=no GLPK_LIBS="-l$glpk_lib" AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])], [ GLPK_LIBS=
--- a/src/ChangeLog Thu Jul 26 18:04:06 2007 +0000 +++ b/src/ChangeLog Thu Jul 26 18:44:07 2007 +0000 @@ -1,3 +1,8 @@ +2007-07-26 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/__glpk__.cc: Include glpk/glpk.h if + HAVE_GLPK_GLPK_H is defined. + 2007-07-26 David Bateman <dbateman@free.fr> * pr-output.cc (Frats): Return character array with same number of