(no commit message)

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 699a63d3d81f9f19c404408b24de2cc203ac7552..3b8b324f50147c2ef4dd3a8a8b87d28977f863ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
 
 # Checks for programs.
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 AC_PROG_AWK
 AC_PROG_CC
 gl_EARLY
@@ -193,6 +193,8 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+if test $build = $target
+then
 AC_MSG_CHECKING([for working HMAC])
 AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
@@ -247,16 +249,27 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+fi     # $build = $target
+
 # glpk
-glpk=0
-AC_CHECK_HEADERS([glpk.h]) 
-if test "$ac_cv_header_glpk_h" = yes; then
-AM_CONDITIONAL(HAVE_GLPK, 1) 
-AC_DEFINE_UNQUOTED([HAVE_GLPK], test x$glpk = xtrue, [We have GLPK])
-else 
-AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue) 
-AC_MSG_WARN([GLPK not installed.]) 
-fi 
+#AC_CHECK_HEADERS(glpk.h, glpk=true)
+#AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
+#AC_CHECK_LIB([glpk],[glp_create_prob])
+
+glpk=true
+AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
+AC_CHECK_LIB([glpk],[glp_create_prob], , [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])
+       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])
+fi
 
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])