remove glpk.

diff --git a/ChangeLog b/ChangeLog
index 8c24a7e5ffbca633dd91df61a287417e45bf6887..c719c4b377677fb55b9084a6bb1674111465ad97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Oct 25 00:00:00 UTC 2019
+  Dropped glpk dependency(-check). -ng0
+
 Wed Oct 23 00:00:00 UTC 2019
   Remove setuid helpers. They never worked as intended. The
   fixed version is not portable and the defacto good way to

diff --git a/README b/README
index ac4a2618cd93e3b6990f6742932d4240896ba6fc..c1e7db2e5656a1b78c2aacdade92ae02b274a836 100644 (file)
--- a/README
+++ b/README
@@ -122,7 +122,6 @@ These are the optional dependencies:
 - grof                              (for linting of man pages)
 - libextractor       >= 0.6.1       (highly recommended[*5])
 - libjansson
-- libglpk            >= 4.45        (for experimental code)
 - libopus            >= 1.0.1       (for experimental conversation tool)
 - libpulse           >= 2.0         (for experimental conversation tool)
 - libogg             >= 1.3.0       (for experimental conversation tool)

diff --git a/configure.ac b/configure.ac
index bf4e1332096e1fc58e270540cac2ff49d48959c5..fc0d75fbf70840cdaa97c0b2114588a28fe6a3ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -791,20 +791,6 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1])
 LIBS=$SAVE_LIBS
 CPPFLAGS=$SAVE_CPPFLAGS
 
-AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false])
-# GLPK must support glpk_init_env, version >= 4.43
-AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false])
-# GLPK must support atm MLP presolving, version >= 4.32
-AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]])
-AS_IF([test "x$glpk" = xfalse],
-[
-       AM_CONDITIONAL(HAVE_LIBGLPK, false)
-       AC_MSG_WARN([ERROR: GNUnet requires GLPK  >= 4.32])
-],[
-       AM_CONDITIONAL(HAVE_LIBGLPK, true)
-       AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
-])
-
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 AS_IF([test x$nss = xfalse],