Mercurial > hg > octave-nkf

diff configure.in @ 6289:e8c4edcfe43d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-08 20:06:54 by jwe]
author jwe
date Thu, 08 Feb 2007 20:06:55 +0000
parents c6a7b0453f9a
children 4e81fe3bceff
line wrap: on
line diff
--- a/configure.in
+++ b/configure.in
@@ -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