build-webkit --gtk --no-webkit2 builds WK2

https://bugs.webkit.org/show_bug.cgi?id=83977

Patch by Philippe Normand <pnormand@igalia.com> on 2012-04-16
Reviewed by Martin Robinson.

* Scripts/build-webkit: Fixup ./configure option to disable
WebKit2 build.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 173e8f4..7383ad3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-16  Philippe Normand  <pnormand@igalia.com>
+
+        build-webkit --gtk --no-webkit2 builds WK2
+        https://bugs.webkit.org/show_bug.cgi?id=83977
+
+        Reviewed by Martin Robinson.
+
+        * Scripts/build-webkit: Fixup ./configure option to disable
+        WebKit2 build.
+
 2012-04-16  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 
         [EFL] [DRT] Feeding key events with invalid keyName

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 91f01ac..6ee9f12 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -711,8 +711,8 @@ for my $dir (@projects) {
 
     my $project = basename($dir);
     if (isGtk()) {
-        if (!$noWebKit2) {
-            unshift(@options, "--enable-webkit2");
+        if ($noWebKit2) {
+            unshift(@options, "--disable-webkit2");
         }
         $result = buildGtkProject($project, $clean, @options);
     } elsif (isAppleMacWebKit()) {