From fdfd52743b04a2f8e75ef595d65103d52685ce1c Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 5 Dec 2013 21:09:49 +0100
Subject: [PATCH] JPEGTranslator Jamfile: Fix build feature dependencies

Move jpeg build feature references into the architecture loop. While
they have the same name, these actually are different build features
(using different packages).
---
 src/add-ons/translators/jpeg/Jamfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/add-ons/translators/jpeg/Jamfile b/src/add-ons/translators/jpeg/Jamfile
index 4b7f3748b1..0591cc9987 100644
--- a/src/add-ons/translators/jpeg/Jamfile
+++ b/src/add-ons/translators/jpeg/Jamfile
@@ -8,17 +8,13 @@ SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) raw ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 	#for BaseTranslator.h and friends
 
-UseBuildFeatureHeaders jpeg ;
-
 AddResources JPEGTranslator : JPEGTranslator.rdef ;
 
-Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
-		JPEGTranslator.cpp ]
-	: [ BuildFeatureAttribute jpeg : headers ] ;
-
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
+		UseBuildFeatureHeaders jpeg ;
+
 		Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
 			be_jdatadst.cpp
 			be_jdatasrc.cpp
@@ -30,7 +26,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			[ BuildFeatureAttribute jpeg : library ]
 			$(TARGET_LIBSTDC++) localestub
 			: true
-		;
+			;
+
+		Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
+				JPEGTranslator.cpp ]
+			: [ BuildFeatureAttribute jpeg : headers ] ;
 	}
 }