From de7cdbc5840fd7d958d486901e405890eff224b9 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@collabora.com>
Date: Mon, 31 Mar 2014 19:18:41 +0200
Subject: Install coinmp and lpsolve linear solvers in parallel.

Change-Id: If07d94a2f646c8377b76fdf645e85f9491e4f061
---
 configure.ac | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f039f1b835e8..3bd45759b6c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,6 +654,7 @@ linux-android*)
     enable_lotuswordpro=no
     enable_mpl_subset=yes
     enable_opengl=no
+    enable_coinmp=no
     enable_lpsolve=no
     enable_report_builder=no
     with_theme="tango"
@@ -7323,6 +7324,7 @@ if test $_os = iOS; then
     enable_mpl_subset=yes
     enable_opengl=no
     enable_lotuswordpro=no
+    enable_coinmp=no
     enable_lpsolve=no
     enable_postgresql_sdbc=no
     enable_lotuswordpro=no
@@ -9408,8 +9410,17 @@ dnl ===================================================================
 dnl How should we build the linear programming solver ?
 dnl ===================================================================
 
-# Should we check for system CoinMP ? How to do that ?
-BUILD_TYPE="$BUILD_TYPE COINMP"
+ENABLE_COINMP=
+AC_MSG_CHECKING([whether to build with CoinMP])
+if test "$enable_coinmp" != "no"; then
+    ENABLE_COINMP=TRUE
+    AC_MSG_RESULT([yes])
+    # Should we check for system CoinMP ? How to do that ?
+    BUILD_TYPE="$BUILD_TYPE COINMP"
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_COINMP)
 
 ENABLE_LPSOLVE=
 AC_MSG_CHECKING([whether to build with lpsolve])
-- 
cgit