summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-06-15 13:10:39 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-06-15 13:10:39 +0000
commit9fbad52a4794d81e82229fa665eb35b9c7dd1924 (patch)
treeb884eb1dd9bb30c6a2789490015b629eb17f0942 /configure.ac
parentb8ee94560053cd737b5a3ea361cd0b397b395ccc (diff)
simple switch to disable ats
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac35
1 files changed, 21 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index dcbe980be..3373b1a12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,24 +250,31 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
# restore LIBS
LIBS=$SAVE_LIBS
+USE_ATS=false
-glpk=true
-# AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
-# AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
-# GLPK must support atm MLP presolving, version >= 4.32
-# AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
-if test x$gplk = xfalse
+if test x$USE_ATS = xtrue
then
-# AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-# AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
- AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
+ glpk=true
+ AC_MSG_WARN([ATS enabled])
+ AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
+ AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
+ # GLPK must support atm MLP presolving, version >= 4.32
+ AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
+ if test x$gplk = xfalse
+ then
+ AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
+ AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+ AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
+ else
+ AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
+ AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
+ AC_MSG_WARN([GLPK is installed])
+ fi
else
-# AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-# AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
- AC_MSG_WARN([GLPK is installed])
+ AC_MSG_WARN([ATS disabled])
+ AM_CONDITIONAL(HAVE_GLPK, false)
+ AM_CONDITIONAL(HAVE_LIBGLPK, false)
fi
-AM_CONDITIONAL(HAVE_GLPK, false)
-AM_CONDITIONAL(HAVE_LIBGLPK, false)
# test for kvm and kstat (for CPU stats under BSD/Solaris)
AC_CHECK_LIB([kvm],[kvm_open])