Changeset 94000 in webkit

Timestamp:

Aug 29, 2011, 12:19:02 PM (14 years ago)

Author:

Martin Robinson

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.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (2 diffs)
• configure.ac (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-26  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <ap@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

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

trunk/configure.ac

@@ -1096 +1096 @@
 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
@@ -1109 +1108 @@
 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])
@@ -1243 +1240 @@
 )
 
-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
 
@@ -1321 +1310 @@
  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:
@@ -1327 +1318 @@
  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