move

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 822c0d53e2cb80a344ee7020464de76e27e16200..26c3c62b4305dd64af4520c9b1d368990c16333b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,8 @@ AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
 
 # Checks for programs.
-AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AC_CANONICAL_SYSTEM
 AC_PROG_AWK
 AC_PROG_CC
 gl_EARLY
@@ -193,6 +194,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,6 +250,28 @@ 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])
+
+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])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -622,6 +647,8 @@ AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+
+
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -811,7 +838,6 @@ src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile
-src/util/libgnu/Makefile
 src/vpn/Makefile
 src/chat/Makefile
 pkgconfig/Makefile