Changeset 95283 in webkit

Timestamp:

Sep 16, 2011 4:43:16 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
​https://bugs.webkit.org/show_bug.cgi?id=68178

Patch by Martin Robinson <​mrobinson@igalia.com> on 2011-09-16
Reviewed by Xan Lopez.

.:

• configure.ac: Do not build WebKit2 by default. Re-add pkgconfig support

for WebKit2.

Source/WebKit2:

• GNUmakefile.am: Do not build WebKit2 by default. Re-add pkgconfig support

for WebKit2.

Tools:

Add a work-around to enable WebKit2 when using build-webkit.

• Scripts/webkitdirs.pm:

(buildAutotoolsProject):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2011-09-16  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=68178
+
+        Reviewed by Xan Lopez.
+
+        * configure.ac: Do not build WebKit2 by default. Re-add pkgconfig support
+        for WebKit2.
+
 2011-09-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-16  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=68178
+
+        Reviewed by Xan Lopez.
+
+        * GNUmakefile.am: Do not build WebKit2 by default. Re-add pkgconfig support
+        for WebKit2.
+
 2011-09-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -914 +914 @@
         $(XT_LIBS)
 
+pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
+
 # WebKit2 specific variables
 forwarding_headers := $(GENSOURCES_WEBKIT2)/include
@@ -960 +962 @@
         $(BUILT_SOURCES) \
         $(top_builddir)/Programs/WebKitWebProcess
+
+DISTCLEANFILES += \
+        $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
 
 # WebKitWebProcess

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-16  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=68178
+
+        Reviewed by Xan Lopez.
+
+        Add a work-around to enable WebKit2 when using build-webkit.
+
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject): 
+
 2011-09-15  James Robinson  <jamesr@chromium.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1522 +1522 @@
     }
 
+    # 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()) {
+        push @buildArgs, "--enable-webkit2";
+    }
+
     $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix);
     push @buildArgs, "--prefix=" . $prefix if defined($prefix);

trunk/configure.ac

@@ -1064 +1064 @@
 AC_MSG_CHECKING([whether to build Webkit2])
 AC_ARG_ENABLE(webkit2,
-    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=yes]]),
-    [], [enable_webkit2="yes"])
+    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]),
+    [], [enable_webkit2="no"])
 AC_MSG_RESULT([$enable_webkit2])
 if test "$enable_webkit2" = "yes"; then
@@ -1204 +1204 @@
 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
 )
+
+
+if test "$enable_webkit2" = "yes"; then
+    AC_CONFIG_FILES([
+    Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
+    ]
+    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
+    )
+fi
 
 AC_OUTPUT