- Revision
- 95283
- Author
- [email protected]
- Date
- 2011-09-16 04:43:16 -0700 (Fri, 16 Sep 2011)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/ChangeLog (95282 => 95283)
--- trunk/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,13 @@
+2011-09-16 Martin Robinson <[email protected]>
+
+ [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 <[email protected]>
Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebKit2/ChangeLog (95282 => 95283)
--- trunk/Source/WebKit2/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,13 @@
+2011-09-16 Martin Robinson <[email protected]>
+
+ [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 <[email protected]>
Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebKit2/GNUmakefile.am (95282 => 95283)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-16 11:43:16 UTC (rev 95283)
@@ -913,6 +913,8 @@
$(XRENDER_LIBS) \
$(XT_LIBS)
+pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
+
# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
@@ -960,6 +962,9 @@
$(BUILT_SOURCES) \
$(top_builddir)/Programs/WebKitWebProcess
+DISTCLEANFILES += \
+ $(top_builddir)/WebKit2/webkit2gtk-@[email protected]
+
# WebKitWebProcess
libexec_PROGRAMS += \
Programs/WebKitWebProcess
Modified: trunk/Tools/ChangeLog (95282 => 95283)
--- trunk/Tools/ChangeLog 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Tools/ChangeLog 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1,3 +1,15 @@
+2011-09-16 Martin Robinson <[email protected]>
+
+ [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 <[email protected]>
Add Antoine Labour and Shawn Singh to the contributors-but-not-committers list.
Modified: trunk/Tools/Scripts/webkitdirs.pm (95282 => 95283)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1521,6 +1521,12 @@
$makeArgs .= " jsc";
}
+ # 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);
Modified: trunk/configure.ac (95282 => 95283)
--- trunk/configure.ac 2011-09-16 09:29:14 UTC (rev 95282)
+++ trunk/configure.ac 2011-09-16 11:43:16 UTC (rev 95283)
@@ -1063,8 +1063,8 @@
# WebKit2
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
if test "$GTK_API_VERSION" = "2.0"; then
@@ -1204,6 +1204,15 @@
,[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
echo "
