Mercurial > octave-nkf
changeset 6381:8a844b3d10b1
[project @ 2007-03-05 18:41:56 by jwe]
| author | jwe |
|---|---|
| date | Mon, 05 Mar 2007 18:41:57 +0000 |
| parents | ac3d67504f85 |
| children | f74e71ef6612 |
| files | ChangeLog configure.in src/ChangeLog src/DLD-FUNCTIONS/__glpk__.cc |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 02 22:08:07 2007 +0000 +++ b/ChangeLog Mon Mar 05 18:41:57 2007 +0000 @@ -1,3 +1,7 @@ +2007-03-05 John W. Eaton <jwe@octave.org> + + * configure.in (GLPK_PRE_4_14): Rename from GLPK_PRE_4_15. + 2007-02-27 John W. Eaton <jwe@octave.org> * Makeconf.in (do-script-uninstall): Remove PKG_ADD.
--- a/configure.in Fri Mar 02 22:08:07 2007 +0000 +++ b/configure.in Mon Mar 05 18:41:57 2007 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.557 $) +AC_REVISION($Revision: 1.558 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -594,7 +594,7 @@ if test -n "$glpk_lib"; then AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [ GLPK_LIBS="-l$glpk_lib" - AC_DEFINE(GLPK_PRE_4_15, 1, [Define if GLPK version is less than 4.15.])], [ + 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, [
--- a/src/ChangeLog Fri Mar 02 22:08:07 2007 +0000 +++ b/src/ChangeLog Mon Mar 05 18:41:57 2007 +0000 @@ -1,3 +1,8 @@ +2007-03-05 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/__glpk__.cc (F__glpk__): Check GLPK_PRE_4_14, not + GLPK_PRE_4_15. + 2007-03-02 John W. Eaton <jwe@octave.org> * parse.y (Fautoload): Undo previous change.
--- a/src/DLD-FUNCTIONS/__glpk__.cc Fri Mar 02 22:08:07 2007 +0000 +++ b/src/DLD-FUNCTIONS/__glpk__.cc Mon Mar 05 18:41:57 2007 +0000 @@ -42,7 +42,7 @@ { #include <glpk.h> -#ifdef GLPK_PRE_4_15 +#ifdef GLPK_PRE_4_14 #ifndef _GLPLIB_H #include <glplib.h> @@ -164,14 +164,14 @@ clock_t t_start = clock(); -#ifdef GLPK_PRE_4_15 +#ifdef GLPK_PRE_4_14 lib_set_fault_hook (0, glpk_fault_hook); #else _glp_lib_fault_hook (glpk_fault_hook, 0); #endif if (lpxIntParam[0] > 1) -#ifdef GLPK_PRE_4_15 +#ifdef GLPK_PRE_4_14 lib_set_print_hook (0, glpk_print_hook); #else _glp_lib_print_hook (glpk_print_hook, 0); @@ -308,7 +308,7 @@ break; default: -#ifdef GLPK_PRE_4_15 +#ifdef GLPK_PRE_4_14 insist (method != method); #else glpk_fault_hook (0, "method != method"); @@ -378,7 +378,7 @@ *time = (clock () - t_start) / CLOCKS_PER_SEC; -#ifdef GLPK_PRE_4_15 +#ifdef GLPK_PRE_4_14 *mem = (lib_env_ptr () -> mem_tpeak); #else *mem = 0;