Kaydet (Commit) 2d6ee4ef authored tarafından Stephan Bergmann's avatar Stephan Bergmann

WITH_JPEG_TURBO redundant with BUILD_TYPE JPEG_TURBO

Change-Id: If918b3083fcd8c2e2ea41c43cba53ded1a207196
üst 0e87fc5c
......@@ -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),\
......
......@@ -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@
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment