[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20087 - gnunet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20087 - gnunet |
Date: |
Mon, 27 Feb 2012 21:00:08 +0100 |
Author: wachs
Date: 2012-02-27 21:00:08 +0100 (Mon, 27 Feb 2012)
New Revision: 20087
Modified:
gnunet/configure.ac
Log:
enabling libglpk detection
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-02-27 19:37:28 UTC (rev 20086)
+++ gnunet/configure.ac 2012-02-27 20:00:08 UTC (rev 20087)
@@ -320,29 +320,21 @@
# restore LIBS
LIBS=$SAVE_LIBS
-AC_ARG_ENABLE([ats],
- [AS_HELP_STRING([--enable-ats], [enable ATS code])],
- [enable_ats=${enableval}],
- [enable_ats=no])
-if test x${enable_ats} = xyes
+
+AC_CHECK_HEADERS([glpk.h],[glpk=true],[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
- AC_CHECK_HEADERS([glpk.h],[glpk=true],[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_LIBGLPK, false)
- AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
- else
- AM_CONDITIONAL(HAVE_LIBGLPK, true)
- AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
- fi
-else
AM_CONDITIONAL(HAVE_LIBGLPK, false)
- AC_MSG_RESULT([no])
+ AC_MSG_WARN([GNUnet requires GLPK >= 4.32])
+else
+ AM_CONDITIONAL(HAVE_LIBGLPK, true)
+ AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
fi
+
# test for kvm and kstat (for CPU stats under BSD/Solaris)
AC_CHECK_LIB([kvm],[kvm_open])
AC_CHECK_LIB([kstat],[kstat_open])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20087 - gnunet,
gnunet <=