summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-25 12:07:06 +0000
committerng0 <ng0@n0.is>2019-10-25 12:07:06 +0000
commit853b43d07307de32a012703cafbc583fdac412a9 (patch)
tree7c7034d6eb88da52ec5cba11c73d93b2843bdb66
parent3650b47b46c944473c28d73b3c148e985879026c (diff)
downloadgnunet-853b43d07307de32a012703cafbc583fdac412a9.tar.gz
gnunet-853b43d07307de32a012703cafbc583fdac412a9.zip
remove glpk.
-rw-r--r--ChangeLog3
-rw-r--r--README1
-rw-r--r--configure.ac14
3 files changed, 3 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c24a7e5f..c719c4b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Fri Oct 25 00:00:00 UTC 2019
2 Dropped glpk dependency(-check). -ng0
3
1Wed Oct 23 00:00:00 UTC 2019 4Wed Oct 23 00:00:00 UTC 2019
2 Remove setuid helpers. They never worked as intended. The 5 Remove setuid helpers. They never worked as intended. The
3 fixed version is not portable and the defacto good way to 6 fixed version is not portable and the defacto good way to
diff --git a/README b/README
index ac4a2618c..c1e7db2e5 100644
--- a/README
+++ b/README
@@ -122,7 +122,6 @@ These are the optional dependencies:
122- grof (for linting of man pages) 122- grof (for linting of man pages)
123- libextractor >= 0.6.1 (highly recommended[*5]) 123- libextractor >= 0.6.1 (highly recommended[*5])
124- libjansson 124- libjansson
125- libglpk >= 4.45 (for experimental code)
126- libopus >= 1.0.1 (for experimental conversation tool) 125- libopus >= 1.0.1 (for experimental conversation tool)
127- libpulse >= 2.0 (for experimental conversation tool) 126- libpulse >= 2.0 (for experimental conversation tool)
128- libogg >= 1.3.0 (for experimental conversation tool) 127- libogg >= 1.3.0 (for experimental conversation tool)
diff --git a/configure.ac b/configure.ac
index bf4e13320..fc0d75fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -791,20 +791,6 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1])
791LIBS=$SAVE_LIBS 791LIBS=$SAVE_LIBS
792CPPFLAGS=$SAVE_CPPFLAGS 792CPPFLAGS=$SAVE_CPPFLAGS
793 793
794AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false])
795# GLPK must support glpk_init_env, version >= 4.43
796AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false])
797# GLPK must support atm MLP presolving, version >= 4.32
798AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]])
799AS_IF([test "x$glpk" = xfalse],
800[
801 AM_CONDITIONAL(HAVE_LIBGLPK, false)
802 AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32])
803],[
804 AM_CONDITIONAL(HAVE_LIBGLPK, true)
805 AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
806])
807
808 794
809AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) 795AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
810AS_IF([test x$nss = xfalse], 796AS_IF([test x$nss = xfalse],