Title: [94000] trunk
- Revision
- 94000
- Author
- [email protected]
- Date
- 2011-08-29 12:19:02 -0700 (Mon, 29 Aug 2011)
Log Message
Reviewed by Xan Lopez.
[GTK] Build WebKit2 unconditionally
https://bugs.webkit.org/show_bug.cgi?id=62749
Build WebKit2 by default. This will make the bots build it and catch
build errors when they occur.
* GNUmakefile.am: Enable WebKit2 by default, but remove references to the WebKit2
PC file, which should not be shipped until WebKit2 is actually shipped officially.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93999 => 94000)
--- trunk/Source/WebKit2/ChangeLog 2011-08-29 19:07:27 UTC (rev 93999)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-29 19:19:02 UTC (rev 94000)
@@ -1,3 +1,16 @@
+2011-08-26 Martin Robinson <[email protected]>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Build WebKit2 unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=62749
+
+ Build WebKit2 by default. This will make the bots build it and catch
+ build errors when they occur.
+
+ * GNUmakefile.am: Enable WebKit2 by default, but remove references to the WebKit2
+ PC file, which should not be shipped until WebKit2 is actually shipped officially.
+
2011-08-29 Alexey Proskuryakov <[email protected]>
Windows build fix.
Modified: trunk/Source/WebKit2/GNUmakefile.am (93999 => 94000)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-08-29 19:07:27 UTC (rev 93999)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-08-29 19:19:02 UTC (rev 94000)
@@ -908,8 +908,6 @@
$(UNICODE_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)
@@ -957,9 +955,6 @@
$(BUILT_SOURCES) \
$(top_builddir)/Programs/WebKitWebProcess
-DISTCLEANFILES += \
- $(top_builddir)/WebKit2/webkit2gtk-@[email protected]
-
# WebKitWebProcess
libexec_PROGRAMS += \
Programs/WebKitWebProcess
Modified: trunk/configure.ac (93999 => 94000)
--- trunk/configure.ac 2011-08-29 19:07:27 UTC (rev 93999)
+++ trunk/configure.ac 2011-08-29 19:19:02 UTC (rev 94000)
@@ -1095,9 +1095,8 @@
# WebKit2
AC_MSG_CHECKING([whether to build Webkit2])
AC_ARG_ENABLE(webkit2,
- AC_HELP_STRING([--enable-webkit2],
- [build webkit2 [default=no]]),
- [], [enable_webkit2="no"])
+ AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=yes]]),
+ [], [enable_webkit2="yes"])
AC_MSG_RESULT([$enable_webkit2])
if test "$enable_webkit2" = "yes"; then
if test "$GTK_API_VERSION" = "2.0"; then
@@ -1108,24 +1107,22 @@
# Plugin Process
AC_MSG_CHECKING([whether to build plugin process for WebKit2])
AC_ARG_ENABLE(plugin_process,
- AC_HELP_STRING([--enable-plugin-process],
- [build plugin process for WebKit2 [default=yes]]),
+ AC_HELP_STRING([--enable-plugin-process], [build plugin process for WebKit2 [default=yes]]),
[], [enable_plugin_process="yes"])
-# Build the plugin process only when building webkit2.
+AC_MSG_RESULT([$enable_plugin_process])
+
+# Build the plugin process only when building Webkit2.
if test "$enable_webkit2" = "no"; then
enable_plugin_process=no
fi
-# Make sure we have gtk+ 2.x to build the plugin process
+# Make sure we have GTK+ 2.x to build the plugin process.
if test "$enable_plugin_process" = "yes"; then
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION gail >= $GAIL2_REQUIRED_VERSION)
fi
-
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
-AC_MSG_RESULT([$enable_plugin_process])
-
GTK_DOC_CHECK([1.10])
# OS conditionals
@@ -1242,14 +1239,6 @@
,[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 "
@@ -1320,14 +1309,14 @@
Animation API : $enable_animation_api
Touch Icon Loading support : $enable_touch_icon_loading
Register Protocol Handler support : $enable_register_protocol_handler
+ WebKit2 support : $enable_webkit2
+ WebKit2 plugin process : $enable_plugin_process
GTK+ configuration:
GTK+ version : $with_gtk
GDK target : $with_target
Hildon UI extensions : $with_hildon
Introspection support : $enable_introspection
- WebKit2 support : $enable_webkit2
- WebKit2 plugin process : $enable_plugin_process
"
if test "$with_unicode_backend" = "glib"; then
echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
