From aad9dd7fd53df9f733a5e0393bcb8326266331c7 Mon Sep 17 00:00:00 2001
From: "philn@webkit.org"
 <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 28 Sep 2011 09:27:35 +0000
Subject: [PATCH] [GTK] build-webkit --no-webkit2 still builds WebKit2
 https://bugs.webkit.org/show_bug.cgi?id=68892

Reviewed by Martin Robinson.

Take the --no-webkit2 option in account when building WebKitGTK+.

* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(buildAutotoolsProject):
(buildGtkProject):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Tools/ChangeLog             | 14 ++++++++++++++
 Tools/Scripts/build-webkit  |  2 +-
 Tools/Scripts/webkitdirs.pm |  8 ++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bf4efda..f43ede2 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] build-webkit --no-webkit2 still builds WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=68892
+
+        Reviewed by Martin Robinson.
+
+        Take the --no-webkit2 option in account when building WebKitGTK+.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject):
+        (buildGtkProject):
+
 2011-09-28  Ryosuke Niwa  <rniwa@webkit.org>
 
         Make Chromium Win Release (Tests) a core builder
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 81224f8..6639099 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -593,7 +593,7 @@ for my $dir (@projects) {
 
     my $project = basename($dir);
     if (isGtk()) {
-        $result = buildGtkProject($project, $clean,  @options);
+        $result = buildGtkProject($project, $clean, !$noWebKit2, @options);
     } elsif (isQt()) {
         #FIXME: $dir should probably be $project.
         $result = buildQMakeQtProject($dir, $clean, @options);
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 42cc509..c190523 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1496,7 +1496,7 @@ sub autogenArgumentsHaveChanged($@)
 
 sub buildAutotoolsProject($@)
 {
-    my ($project, $clean, @buildParams) = @_;
+    my ($project, $clean, $enableWebKit2, @buildParams) = @_;
 
     my $make = 'make';
     my $dir = productDir();
@@ -1529,7 +1529,7 @@ sub buildAutotoolsProject($@)
 
     # This is a temporary work-around to enable building WebKit2 on the bots,
     # but ensuring that it does not ship until the API is stable.
-    if ($project eq "WebKit" and isGtk()) {
+    if ($project eq "WebKit" and isGtk() and $enableWebKit2) {
         push @buildArgs, "--enable-webkit2";
     }
 
@@ -1867,13 +1867,13 @@ sub buildQMakeQtProject($$@)
 
 sub buildGtkProject
 {
-    my ($project, $clean, @buildArgs) = @_;
+    my ($project, $clean, $enableWebKit2, @buildArgs) = @_;
 
     if ($project ne "WebKit" and $project ne "JavaScriptCore") {
         die "Unsupported project: $project. Supported projects: WebKit, JavaScriptCore\n";
     }
 
-    return buildAutotoolsProject($project, $clean, @buildArgs);
+    return buildAutotoolsProject($project, $clean, $enableWebKit2, @buildArgs);
 }
 
 sub buildChromiumMakefile($$@)
-- 
2.7.4