[Libreoffice-commits] core.git: configure.ac Repository.mk sccomp/Module_sccomp.mk

[Caolán McNamara]

 Repository.mk           |    4 ++--
 configure.ac            |    1 +
 sccomp/Module_sccomp.mk |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 84cbd415cdc7dacc1b2376ccf47b484ae87f7b3b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 18 15:13:51 2017 +0000

    we now get a solver lib even without lpsolve or coinmp
    
    Change-Id: I867d9aa37f876532dd67dadff7cd76f6e35868ba
    Reviewed-on: https://gerrit.libreoffice.org/44912
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Repository.mk b/Repository.mk
index 77608e4790af..70d842f95d17 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -255,7 +255,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
 	scfilt \
 	scui \
 	wpftcalc \
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \
+	solver \
 	$(call gb_Helper_optional,SCRIPTING,vbaobj) \
 ))
 
@@ -1082,7 +1082,7 @@ $(eval $(call gb_Helper_register_mos,\
 	$(call gb_Helper_optional,SCRIPTING,sb) \
 	sc \
 	sca \
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),scc) \
+	scc \
 	sd \
 	sfx \
 	sm \
diff --git a/configure.ac b/configure.ac
index 1dabb24a252c..a1842ce57d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,6 +631,7 @@ darwin*) # Mac OS X or iOS
         test_cups=no
         enable_mpl_subset=yes
         enable_lotuswordpro=no
+        enable_coinmp=no
         enable_lpsolve=no
         enable_postgresql_sdbc=no
         enable_extension_integration=no
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 97b0c2fe356f..ef6d47984bf2 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -20,11 +20,11 @@
 $(eval $(call gb_Module_Module,sccomp))
 
 $(eval $(call gb_Module_add_targets,sccomp,\
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), Library_solver) \
+	Library_solver \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sccomp,\
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), AllLangMoTarget_scc) \
+	AllLangMoTarget_scc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sccomp,\