From 8ae2b062a6a39fdbcb41fc6c2f75d30460b5f336 Mon Sep 17 00:00:00 2001
From: Alexandre Deckner <alexandre.deckner@uzzl.com>
Date: Wed, 4 Jul 2012 01:49:32 +0200
Subject: [PATCH] Fix control flow, stop if gcc < 4. Change package URL

---
 build/jam/OptionalBuildFeatures | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 1650242892..c29c74feed 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -421,34 +421,34 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 
 
 # WebKit
-local webkitBaseURL = http://dude.uzzl.net/haiku ;
+local webkitBaseURL = http://haiku-files.org/files/optional-packages ;
 if $(TARGET_ARCH) = x86 {
-	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
-	} else {
+	if $(HAIKU_GCC_VERSION[1]) < 4 {
 		Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
-	}
+	} else {
+	    HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
 
-	local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
-		: $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
+	    local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
+		    : $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
 
-	HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
-		$(HAIKU_WEBKIT_FILE:B) ] ;
+	    HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		    $(HAIKU_WEBKIT_FILE:B) ] ;
 
-	HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
-		: include/ : $(zipFile) : extracted-webkit ] ;
+	    HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		    : include/ : $(zipFile) : extracted-webkit ] ;
 
-	HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
-		:
-		lib/libwtf.so
-		lib/libjavascriptcore.so
-		lib/libwebcore.so
-		lib/libwebkit.so
-		: $(zipFile)
-		: extracted-webkit
-	] ;
+	    HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		    :
+		    lib/libwtf.so
+		    lib/libjavascriptcore.so
+		    lib/libwebcore.so
+		    lib/libwebkit.so
+		    : $(zipFile)
+		    : extracted-webkit
+	    ] ;
 
-	HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+	    HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+    }
 } else {
 	Echo "WebKit support not available on $(TARGET_ARCH)" ;
 }