summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-03-23 12:55:18 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-03-23 12:55:18 +0000
commit1f48706b38a99959f71c2c6a3755024d0b86f95d (patch)
treeecb85395005ec8c4bd4bc6df4e013ec4c3aba2d0
parent5598af2681b330ef126664e835f02f750b1491cd (diff)
changes to configure.ac
-rw-r--r--configure.ac25
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/transport/gnunet-service-transport.c17
3 files changed, 24 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 699a63d3d..ad5cdaf20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,15 +248,22 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
LIBS=$SAVE_LIBS
# glpk
-glpk=0
-AC_CHECK_HEADERS([glpk.h])
-if test "$ac_cv_header_glpk_h" = yes; then
-AM_CONDITIONAL(HAVE_GLPK, 1)
-AC_DEFINE_UNQUOTED([HAVE_GLPK], test x$glpk = xtrue, [We have GLPK])
-else
-AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
-AC_MSG_WARN([GLPK not installed.])
-fi
+#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
+then
+ AC_MSG_NOTICE([Feature b0rk is missing.])
+ AM_CONDITIONAL(HAVE_GLPK, [test x$a = xtrue])
+else
+ AC_MSG_NOTICE([Feature b0rk is present.])
+ AM_CONDITIONAL(HAVE_GLPK, [test x$a = xtrue])
+ AM_CONDITIONAL(HAVE_LIBGLPK, [test x$a = x$a])
+fi
# test for kvm and kstat (for CPU stats under BSD/Solaris)
AC_CHECK_LIB([kvm],[kvm_open])
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 43c4692b5..4706570e4 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -105,7 +105,7 @@ gnunet_transport_LDADD = \
gnunet_transport_DEPENDENCIES = \
libgnunettransport.la
-if HAVE_GLPK
+if HAVE_LIBGLPK
GN_GLPK = -lglpk
endif
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index ba9cdfbc6..116482c60 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -38,7 +38,7 @@
#include "gnunet_signatures.h"
#include "gnunet_transport_plugin.h"
#include "transport.h"
-#if HAVE_GLPK
+#if HAVE_LIBGLPK
#include <glpk.h>
#endif
@@ -5548,12 +5548,14 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_break (bl_head == NULL);
GNUNET_break (bc_head == NULL);
}
+#if !HAVE_LIBGLPK
+void ats_create_problem(int peers, double b_min, double b_max, double r, const struct ATS_peer * list, int max_it, int max_dur)
+{
-
-#if HAVE_GLPK
-
-glp_prob * ats_create_problem(int peers, double b_min, double b_max, double r, const struct ATS_peer * list, int max_it, int max_dur)
+}
+#else
+glp_prob * ats_create_problem (int peers, double b_min, double b_max, double r, const struct ATS_peer * list, int max_it, int max_dur)
{
int c1, c2;
glp_prob *lp;
@@ -5689,11 +5691,6 @@ glp_prob * ats_create_problem(int peers, double b_min, double b_max, double r, c
//GNUNET_free(options);
return lp;
}
-#else
-void ats_create_problem(int peers, double b_min, double b_max, double r, const struct ATS_peer * list, int max_it, int max_dur)
-{
-
-}
#endif
void ats_calculate_bandwidth_distribution (struct ATS_info * ats)