diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | configure.ac | 14 |
3 files changed, 3 insertions, 15 deletions
@@ -1,3 +1,6 @@ | |||
1 | Fri Oct 25 00:00:00 UTC 2019 | ||
2 | Dropped glpk dependency(-check). -ng0 | ||
3 | |||
1 | Wed Oct 23 00:00:00 UTC 2019 | 4 | Wed 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 |
@@ -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]) | |||
791 | LIBS=$SAVE_LIBS | 791 | LIBS=$SAVE_LIBS |
792 | CPPFLAGS=$SAVE_CPPFLAGS | 792 | CPPFLAGS=$SAVE_CPPFLAGS |
793 | 793 | ||
794 | AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false]) | ||
795 | # GLPK must support glpk_init_env, version >= 4.43 | ||
796 | AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) | ||
797 | # GLPK must support atm MLP presolving, version >= 4.32 | ||
798 | AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]]) | ||
799 | AS_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 | ||
809 | AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) | 795 | AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) |
810 | AS_IF([test x$nss = xfalse], | 796 | AS_IF([test x$nss = xfalse], |