summaryrefslogtreecommitdiff
path: root/configure.ac
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 /configure.ac
parent5598af2681b330ef126664e835f02f750b1491cd (diff)
changes to configure.ac
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac25
1 files changed, 16 insertions, 9 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])