From 2d6ee4ef812f8ac51c0a07fc4e44e54593a90fa6 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 3 Dec 2014 08:26:17 +0100
Subject: [PATCH] WITH_JPEG_TURBO redundant with BUILD_TYPE JPEG_TURBO

Change-Id: If918b3083fcd8c2e2ea41c43cba53ded1a207196
---
 RepositoryExternal.mk | 2 +-
 config_host.mk.in     | 1 -
 configure.ac          | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f2af5fc4f09b..3ae0eb61fc70 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -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),\
diff --git a/config_host.mk.in b/config_host.mk.in
index 13639e86a878..9224237a9926 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -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@
diff --git a/configure.ac b/configure.ac
index 3be712e961b1..7740f0aa29e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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