GLPK API change

[michael . goffioul]

Hi,
 
I wanted to update the GLPK library to the latest version (4.14), but it
appears that the API has changed, leading to compilation errors in
__glpk__.cc. See the following (ugly) patch to see what changes are
required.
 
The previous version I was using is 4.9. So the question is: should octave
require the latest version of GLPK (and __glpk__.cc should be changed
accordingly, not with my ugly patch), or should it support both API?
 
Note also that the test in the configure script will fail because it looks for
the symbol glp_lpx_simplex, while now all symbols are prepended with
an underscore.
 
Michael.
 
Index: src/DLD-FUNCTIONS/__glpk__.cc
===================================================================
RCS file: /cvs/octave/src/DLD-FUNCTIONS/__glpk__.cc,v
retrieving revision 1.17
diff -c -p -r1.17 __glpk__.cc
*** src/DLD-FUNCTIONS/__glpk__.cc       6 Jul 2006 22:34:55 -0000       1.17
--- src/DLD-FUNCTIONS/__glpk__.cc       8 Feb 2007 13:40:05 -0000
*************** Software Foundation, Inc., 51 Franklin S
*** 40,45 ****
--- 40,54 ----
  
  extern "C" {
  #include <glpk.h>
+ #ifndef _GLPLIB_H
+ #include <glplib.h>
+ #endif
+ #ifndef lib_set_fault_hook
+ #define lib_set_fault_hook lib_fault_hook
+ #endif
+ #ifndef lib_set_print_hook
+ #define lib_set_print_hook lib_print_hook
+ #endif
  }
  
  #define NIntP 17
*************** glpk (int sense, int n, int m, double *c

*** 342,348 ****
--- 351,361 ----
        }
 
        *time = (clock () - t_start) / CLOCKS_PER_SEC;
+ #ifdef ulong_t
+       *mem = *(unsigned long long*)&(lib_env_ptr () -> mem_tpeak);
+ #else
        *mem = (lib_env_ptr () -> mem_tpeak);
+ #endif
 
        lpx_delete_prob (lp);
        return 0;