Revert "Allow to build lpsolver based on CoinMP library."

This reverts commit 4f7b9688.

Conflicts:
	configure.ac
	scp2/InstallModule_ooo.mk

Change-Id: I5621496d70a2c493eb964c1138d310c68fa6d660

Repository.mk

@@ -156,8 +156,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
 	scd \
 	scfilt \
 	scui \
+	$(if $(MPL_SUBSET),,$(if $(ENABLE_LPSOLVE),solver)) \
 	$(if $(ENABLE_OPENCL),scopencl) \
-	$(if $(WITH_LPSOLVER),solver) \
 	$(if $(DISABLE_SCRIPTING),,vbaobj) \
 	$(if $(ENABLE_TELEPATHY),tubes) \
 ))

RepositoryExternal.mk

@@ -1982,7 +1982,7 @@ endef
 endif # ANDROID
 endif # SYSTEM_LCMS2
 
-ifeq ($(WITH_LPSOLVER),lpsolve)
+ifneq ($(ENABLE_LPSOLVE),)
 
 ifneq ($(SYSTEM_LPSOLVE),)
 
@@ -2020,7 +2020,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 
 endif # SYSTEM_LPSOLVE
 
-else ifeq ($(WITH_LPSOLVER),coinmp)
+endif # ENABLE_LPSOLVE
+
+ifneq ($(ENABLE_COINMP),)
 
 define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
@@ -2050,7 +2052,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	coinmp \
 ))
 
-endif # WITH_LPSOLVER
+endif # ENABLE_COINMP
 
 ifeq ($(ENABLE_GIO),TRUE)
 

config_host.mk.in

@@ -137,6 +137,7 @@ export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_KDE=@ENABLE_KDE@
 export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
 export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
+export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
 export ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=@ENABLE_MACOSX_MACLIKE_APP_STRUCTURE@
@@ -601,7 +602,6 @@ export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
 export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
-export WITH_LPSOLVER=@WITH_LPSOLVER@
 export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
 export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
 export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@

configure.ac

@@ -654,6 +654,7 @@ linux-android*)
     enable_lotuswordpro=no
     enable_mpl_subset=yes
     enable_opengl=no
+    enable_lpsolve=no
     enable_report_builder=no
     with_theme="tango"
     test_cups=no
@@ -1763,14 +1764,6 @@ AC_ARG_WITH(system-npapi-headers,
     [with_system_npapi_headers="$with_system_headers"]
 )
 
-AC_ARG_WITH(lpsolver,
-    AS_HELP_STRING([--with-lpsolver],
-        [Specify which library to use for lpsolver implementation in sccomp.
-         Possible values: "lpsolve", "coinmp", "no". The default value is "lpsolve".
-         Example: --with-lpsolver="coinmp"]),
-    WITH_LPSOLVER=$withval,
-    WITH_LPSOLVER="lpsolve")
-
 AC_ARG_WITH(webdav,
     AS_HELP_STRING([--with-webdav],
         [Specify which library to use for webdav implementation.
@@ -7330,6 +7323,7 @@ if test $_os = iOS; then
     enable_mpl_subset=yes
     enable_opengl=no
     enable_lotuswordpro=no
+    enable_lpsolve=no
     enable_postgresql_sdbc=no
     enable_lotuswordpro=no
     enable_extension_integration=no
@@ -9413,48 +9407,40 @@ AC_SUBST(MYTHES_LIBS)
 dnl ===================================================================
 dnl How should we build the linear programming solver ?
 dnl ===================================================================
-if test "$enable_mpl_subset" = "yes"; then
-    WITH_LPSOLVER="coinmp"
+
+# Should we check for system CoinMP ? How to do that ?
+BUILD_TYPE="$BUILD_TYPE COINMP"
+
+ENABLE_LPSOLVE=
+AC_MSG_CHECKING([whether to build with lpsolve])
+if test "$enable_lpsolve" != "no"; then
+    ENABLE_LPSOLVE=TRUE
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_LPSOLVE)
+
+AC_MSG_CHECKING([which lpsolve to use])
+if test "$with_system_lpsolve" = "yes"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LPSOLVE=TRUE
+    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
+       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+    save_LIBS=$LIBS
+    # some systems need this. Like Ubuntu....
+    AC_CHECK_LIB(m, floor)
+    AC_CHECK_LIB(dl, dlopen)
+    AC_CHECK_LIB([lpsolve55], [make_lp], [:],
+        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+    LIBS=$save_LIBS
+    libo_MINGW_CHECK_DLL([lpsolve55])
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LPSOLVE=
+    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
 fi
-if test $_os = iOS -o $_os = Android; then
-    WITH_LPSOLVER="no"
-fi
-AC_MSG_CHECKING([for lpsolver library])
-case "$WITH_LPSOLVER" in 
-coinmp)
-    AC_MSG_RESULT([CoinMP])
-    # Should we check for system CoinMP ? How to do that ?
-    BUILD_TYPE="$BUILD_TYPE COINMP"
-    ;;
-lpsolve)
-    AC_MSG_RESULT([lpsolve])
-    AC_MSG_CHECKING([which lpsolve to use])
-    if test "$with_system_lpsolve" = "yes"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_LPSOLVE=TRUE
-        AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
-           [ AC_MSG_ERROR(lpsolve headers not found.)], [])
-        save_LIBS=$LIBS
-        # some systems need this. Like Ubuntu....
-        AC_CHECK_LIB(m, floor)
-        AC_CHECK_LIB(dl, dlopen)
-        AC_CHECK_LIB([lpsolve55], [make_lp], [:],
-            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-        LIBS=$save_LIBS
-        libo_MINGW_CHECK_DLL([lpsolve55])
-    else
-        AC_MSG_RESULT([internal])
-        SYSTEM_LPSOLVE=
-        BUILD_TYPE="$BUILD_TYPE LPSOLVE"
-    fi
-    ;;
-*)
-    AC_MSG_RESULT([none, disabled])
-    WITH_LPSOLVER=""
-    ;;
-esac
 AC_SUBST(SYSTEM_LPSOLVE)
-AC_SUBST(WITH_LPSOLVER)
 
 dnl ===================================================================
 dnl Checking for libexttextcat
@@ -12552,8 +12538,8 @@ if test "$enable_mpl_subset" = "yes"; then
     if test "$enable_opengl" != "no" -o "x$ENABLE_OPENGL" = "xTRUE"; then
         AC_MSG_ERROR([need to --disable-opengl - GL transitions support.])
     fi
-    if test "$WITH_LPSOLVER" = "lpsolve"; then
-        AC_MSG_ERROR([need --with-lpsolver=coinmp or --without-lpsolver - calc linear programming solver.])
+    if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" = "xTRUE"; then
+        AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming solver.])
     fi
 
     MPL_SUBSET="TRUE"

postprocess/Rdb_services.mk

@@ -109,7 +109,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	xmlscript/util/xmlscript \
 	xmlsecurity/util/xmlsecurity \
 	xmlsecurity/util/xsec_fw \
-	$(if $(WITH_LPSOLVER), \
+	$(if $(ENABLE_LPSOLVE), \
 		sccomp/source/solver/solver \
 	) \
 	writerfilter/util/writerfilter \

sccomp/Library_solver.mk

@@ -35,19 +35,11 @@ $(eval $(call gb_Library_use_libraries,solver,\
 
 $(eval $(call gb_Library_use_externals,solver,\
 	boost_headers \
-	$(WITH_LPSOLVER) \
+	lpsolve \
 ))
 
-ifeq ($(WITH_LPSOLVER),lpsolve)
 $(eval $(call gb_Library_add_exception_objects,solver,\
 	sccomp/source/solver/solver-lpsolve \
 ))
 
-else ifeq ($(WITH_LPSOLVER),coinmp)
-$(eval $(call gb_Library_add_exception_objects,solver,\
-	sccomp/source/solver/solver \
-))
-
-endif
-
 # vim: set noet sw=4 ts=4:

sccomp/Module_sccomp.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Module_Module,sccomp))
 
-ifneq ($(WITH_LPSOLVER),)
+ifeq ($(ENABLE_LPSOLVE),TRUE)
 
 $(eval $(call gb_Module_add_targets,sccomp,\
 	Library_solver \

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 \
 ))