X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=3b8b324f50147c2ef4dd3a8a8b87d28977f863ee;hb=2c803aa73957a91e8d523b072134dff7b6c5ca73;hp=b5b95721282c61313b54ace00ae36326b730bae4;hpb=b596c078b0d9d2ef9bae6afd2a343f78a311dd4e;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index b5b957212..3b8b324f5 100644
--- 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,21 +249,26 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+fi	# $build = $target
+
 # glpk
 #AC_CHECK_HEADERS(glpk.h, glpk=true)
 #AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
 #AC_CHECK_LIB([glpk],[glp_create_prob])
 
-a=true
-AC_CHECK_HEADERS(glpk.h, ,[a=false])
-AC_CHECK_LIB([glpk],[glp_create_prob], , [a=false])
-if test $a == false
+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$a = xtrue])
-	AM_CONDITIONAL(HAVE_LIBGLPK, [test x$a != x$a])
+	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$a = xtrue])
-	AM_CONDITIONAL(HAVE_LIBGLPK, [test x$a = x$a])
+	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)