From 8dc394d5c573e5583760c7cc56c5c19062d3f062 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@collabora.com>
Date: Mon, 31 Mar 2014 19:36:41 +0200
Subject: Revert "Allow to build lpsolver based on CoinMP library."

This reverts commit 4f7b96886ec2e98f270a9ec3c3509cd523fce7cc.

Conflicts:
	configure.ac
	scp2/InstallModule_ooo.mk

Change-Id: I5621496d70a2c493eb964c1138d310c68fa6d660
---
 scp2/InstallModule_calc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scp2')

diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index b64ae2abac10..a4d558329e67 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
 	ENABLE_MACOSX_SANDBOX \
 ))
 
-ifneq (,$(WITH_LPSOLVER))
+ifneq (,$(ENABLE_COINMP)$(ENABLE_LPSOLVE))
 $(eval $(call gb_InstallModule_add_defs,scp2/calc,\
 	-DWITH_LPSOLVER \
 ))
-- 
cgit