projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move
[oweals/gnunet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b3a965e3b0a2f23d9b923244155726372bb4cae1..26c3c62b4305dd64af4520c9b1d368990c16333b 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-29,6
+29,7
@@
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
# Checks for programs.
AH_TOP([#define _GNU_SOURCE 1])
# Checks for programs.
+AC_CANONICAL_TARGET
AC_CANONICAL_SYSTEM
AC_PROG_AWK
AC_PROG_CC
AC_CANONICAL_SYSTEM
AC_PROG_AWK
AC_PROG_CC
@@
-259,10
+260,13
@@
fi # $build = $target
glpk=true
AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
glpk=true
AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
-if test $gplk == false
+# GLPK must support atm MLP presolving, version >= 4.32
+AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
+if test $gplk = false
then
AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
then
AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+ AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
else
AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
else
AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])