mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WITH_JPEG_TURBO redundant with BUILD_TYPE JPEG_TURBO

Browse Source 
Change-Id: If918b3083fcd8c2e2ea41c43cba53ded1a207196
This commit is contained in:
Stephan Bergmann 2014-12-03 08:26:17 +01:00
parent 0e87fc5ce7
commit 2d6ee4ef81
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryExternal.mk
View File

@ -455,7 +455,7 @@ $(call gb_LinkTarget_set_ldflags,$(1),\
endef
else ifeq ($(WITH_JPEG_TURBO),TRUE)
else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),)
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_set_include,$(1),\

1
config_host.mk.in
View File

@ -620,7 +620,6 @@ export WITH_FONTS=@WITH_FONTS@
export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@
export WITH_GSSAPI=@WITH_GSSAPI@
export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
export WITH_JPEG_TURBO=@WITH_JPEG_TURBO@
export WITH_KRB5=@WITH_KRB5@
export WITH_LANG=@WITH_LANG@
export WITH_LANG_LIST=@WITH_LANG_LIST@

2
configure.ac
View File

@ -7360,7 +7360,6 @@ else
SYSTEM_JPEG=
if test "$with_jpeg_turbo" = "yes"; then
AC_MSG_RESULT([internal, jpeg-turbo])
WITH_JPEG_TURBO=TRUE
BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
if test -z "$NASM" -a "$build_os" = "cygwin" -a -x "/opt/lo/bin/nasm"; then
@ -7406,7 +7405,6 @@ _EOS
fi
AC_SUBST(NASM)
AC_SUBST(SYSTEM_JPEG)
AC_SUBST(WITH_JPEG_TURBO)
dnl ===================================================================
dnl Check for system clucene