normalize valuse of SYSTEM_MYTHES, SYSTEM_LPSOLVE
Change-Id: Ie61f6a0e572dcc3cdc4cbca698fb90d67f9a87ad
This commit is contained in:
parent
9fc9e9cfec
commit
ab586f14e0
2 changed files with 6 additions and 6 deletions
|
@ -430,7 +430,7 @@ endef
|
|||
|
||||
endif # SYSTEM_JPEG
|
||||
|
||||
ifeq ($(SYSTEM_MYTHES),YES)
|
||||
ifneq ($(SYSTEM_MYTHES),)
|
||||
|
||||
define gb_LinkTarget__use_mythes
|
||||
$(call gb_LinkTarget_set_include,$(1),\
|
||||
|
@ -1842,7 +1842,7 @@ endif # ANDROID
|
|||
endif # SYSTEM_LCMS2
|
||||
|
||||
|
||||
ifeq ($(SYSTEM_LPSOLVE),YES)
|
||||
ifneq ($(SYSTEM_LPSOLVE),)
|
||||
|
||||
define gb_LinkTarget__use_lpsolve
|
||||
$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
|
||||
|
|
|
@ -9556,7 +9556,7 @@ dnl ===================================================================
|
|||
AC_MSG_CHECKING([which mythes to use])
|
||||
if test "$with_system_mythes" = "yes"; then
|
||||
AC_MSG_RESULT([external])
|
||||
SYSTEM_MYTHES=YES
|
||||
SYSTEM_MYTHES=TRUE
|
||||
AC_LANG_PUSH([C++])
|
||||
PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
|
||||
if test "$MYTHES_PKGCONFIG" = "no"; then
|
||||
|
@ -9577,7 +9577,7 @@ if test "$with_system_mythes" = "yes"; then
|
|||
MYTHES_CFLAGS=$(printf '%s' "$MYTHES_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
|
||||
else
|
||||
AC_MSG_RESULT([internal])
|
||||
SYSTEM_MYTHES=NO
|
||||
SYSTEM_MYTHES=
|
||||
BUILD_TYPE="$BUILD_TYPE MYTHES"
|
||||
if test "$COM" = "MSC"; then
|
||||
MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
|
||||
|
@ -9605,7 +9605,7 @@ AC_SUBST(ENABLE_LPSOLVE)
|
|||
AC_MSG_CHECKING([which lpsolve to use])
|
||||
if test "$with_system_lpsolve" = "yes"; then
|
||||
AC_MSG_RESULT([external])
|
||||
SYSTEM_LPSOLVE=YES
|
||||
SYSTEM_LPSOLVE=TRUE
|
||||
AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
|
||||
[ AC_MSG_ERROR(lpsolve headers not found.)], [])
|
||||
save_LIBS=$LIBS
|
||||
|
@ -9618,7 +9618,7 @@ if test "$with_system_lpsolve" = "yes"; then
|
|||
libo_MINGW_CHECK_DLL([lpsolve55])
|
||||
else
|
||||
AC_MSG_RESULT([internal])
|
||||
SYSTEM_LPSOLVE=NO
|
||||
SYSTEM_LPSOLVE=
|
||||
BUILD_TYPE="$BUILD_TYPE LPSOLVE"
|
||||
fi
|
||||
AC_SUBST(SYSTEM_LPSOLVE)
|
||||
|
|
Loading…
Reference in a new issue