# HG changeset patch
# User jwe
# Date 1185475447 0
# Node ID 4d3fa8841006b4a09b59e81da77231d92fd9faf0
# Parent  fe19c6cb5bc673ebbec7ed2e3db8f7057480ed5a
[project @ 2007-07-26 18:44:06 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -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=
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/DLD-FUNCTIONS/__glpk__.cc b/src/DLD-FUNCTIONS/__glpk__.cc
--- a/src/DLD-FUNCTIONS/__glpk__.cc
+++ b/src/DLD-FUNCTIONS/__glpk__.cc
@@ -40,7 +40,11 @@
 
 extern "C"
 {
+#if defined (HAVE_GLPK_GLPK_H)
+#include <glpk/glpk.h>
+#else
 #include <glpk.h>
+#endif
 
 #ifdef GLPK_PRE_4_14