Changeset 155899 in webkit

Timestamp:

Sep 16, 2013 2:01:16 PM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][2.2] Enable the Wayland target by default if the GTK+ Wayland dependency is available
​https://bugs.webkit.org/show_bug.cgi?id=121414

Reviewed by Martin Robinson.

• Source/autotools/FindDependencies.m4: If the Wayland target is not strictly disabled, also check that the GTK+ Wayland

package (gtk+-wayland-3.0) has a recent-enough version. If the dependency could not be satisfied, either a warning or an
error is printed out, depending if the Wayland target was required or just optional.

• Source/autotools/PrintBuildConfiguration.m4: Add a new macro, AM_APPEND_TO_DESRIPTION, that's helpful when producing

a description string that can contain multiple items that should be nicely formatted when listed in that string. This is
then used when creating the description for all the enabled targets, so for instance 'x11, wayland' string would be displayed
if both the X11 and Wayland targets are enabled.

• Source/autotools/ReadCommandLineArguments.m4: The --with-target configuration options should default to 'x11,wayland' if

not given, with the Wayland target in that case not being a hard requirement (i.e. it should be disabled if the dependencies
for the Wayland target could not be found).

• Source/autotools/Versions.m4: The GTK+ Wayland dependency should be of version 3.9.14 or greater (the 3.10 release series).

Location:

releases/WebKitGTK/webkit-2.2

Files:

• ChangeLog (modified) (1 diff)
• Source/autotools/FindDependencies.m4 (modified) (1 diff)
• Source/autotools/PrintBuildConfiguration.m4 (modified) (2 diffs)
• Source/autotools/ReadCommandLineArguments.m4 (modified) (2 diffs)
• Source/autotools/Versions.m4 (modified) (1 diff)

releases/WebKitGTK/webkit-2.2/ChangeLog

@@ +1 @@
+2013-09-16  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][2.2] Enable the Wayland target by default if the GTK+ Wayland dependency is available
+        https://bugs.webkit.org/show_bug.cgi?id=121414
+
+        Reviewed by Martin Robinson.
+
+        * Source/autotools/FindDependencies.m4: If the Wayland target is not strictly disabled, also check that the GTK+ Wayland
+        package (gtk+-wayland-3.0) has a recent-enough version. If the dependency could not be satisfied, either a warning or an
+        error is printed out, depending if the Wayland target was required or just optional.
+        * Source/autotools/PrintBuildConfiguration.m4: Add a new macro, AM_APPEND_TO_DESRIPTION, that's helpful when producing
+        a description string that can contain multiple items that should be nicely formatted when listed in that string. This is
+        then used when creating the description for all the enabled targets, so for instance 'x11, wayland' string would be displayed
+        if both the X11 and Wayland targets are enabled.
+        * Source/autotools/ReadCommandLineArguments.m4: The --with-target configuration options should default to 'x11,wayland' if
+        not given, with the Wayland target in that case not being a hard requirement (i.e. it should be disabled if the dependencies
+        for the Wayland target could not be found).
+        * Source/autotools/Versions.m4: The GTK+ Wayland dependency should be of version 3.9.14 or greater (the 3.10 release series).
+
 2013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
 

releases/WebKitGTK/webkit-2.2/Source/autotools/FindDependencies.m4

@@ -197 +197 @@
 fi
 
-if test "$with_wayland_target" = "yes"; then
+if test "$with_wayland_target" != "no"; then
     # The GTK+ Wayland target dependency should match the version of the master GTK+ dependency.
-    PKG_CHECK_MODULES(GTK_WAYLAND, gtk+-wayland-$GTK_API_VERSION = $GTK_ACTUAL_VERSION)
+    PKG_CHECK_MODULES([GTK_WAYLAND], [
+        gtk+-wayland-$GTK_API_VERSION = $GTK_ACTUAL_VERSION
+        gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version
+    ], [with_wayland_target=yes], [
+        if test "$with_wayland_target" = "yes"; then
+            AC_MSG_ERROR([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found.])
+        else
+            AC_MSG_WARN([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found, disabling the Wayland target.])
+            with_wayland_target=no
+        fi
+    ])
 fi
 

releases/WebKitGTK/webkit-2.2/Source/autotools/PrintBuildConfiguration.m4

@@ +1 @@
+dnl AM_APPEND_TO_DESCRIPTION
+dnl Appends the given string to the description variable,
+dnl using a separator if the description variable is not empty.
+dnl
+dnl Usage:
+dnl AM_APPEND_TO_DESCRIPTION([DESCRIPTION], [STRING])
+AC_DEFUN([AM_APPEND_TO_DESCRIPTION], [
+  if test "$$1" != ""; then
+    $1="${$1}, "
+  fi
+
+  $1="${$1}$2"
+]) dnl AM_APPEND_TO_DESCRIPTION
+
+
+target_description=""
+if test "$with_x11_target" = "yes"; then
+    AM_APPEND_TO_DESCRIPTION(target_description, "x11")
+fi
+if test "$with_wayland_target" = "yes"; then
+    AM_APPEND_TO_DESCRIPTION(target_description, "wayland")
+fi
+if test "$with_target" = "win32"; then
+    AM_APPEND_TO_DESCRIPTION(target_description, "win32")
+fi
+if test "$with_target" = "quartz"; then
+    AM_APPEND_TO_DESCRIPTION(target_description, "quartz")
+fi
+if test "$with_target" = "directfb"; then
+    AM_APPEND_TO_DESCRIPTION(target_description, "directfb")
+fi
+
 AC_OUTPUT
 
@@ -34 +66 @@
 GTK+ configuration:
  GTK+ version                                             : $with_gtk
- GDK targets                                              : $with_target
+ GDK targets                                              : $target_description
  Introspection support                                    : $enable_introspection
  Generate documentation                                   : $enable_gtk_doc

releases/WebKitGTK/webkit-2.2/Source/autotools/ReadCommandLineArguments.m4

@@ -55 +55 @@
         esac
     ],
-    [with_target="x11"])
+    [with_target="x11,wayland"; with_wayland_target="auto"])
 AC_MSG_RESULT([$with_target])
 
@@ -63 +63 @@
 if test "$with_target" = "x11,wayland"; then
     with_x11_target=yes
-    with_wayland_target=yes
+    if test "$with_wayland_target" != "auto"; then
+        with_wayland_target=yes
+    fi
 elif test "$with_target" = "x11"; then
     with_x11_target=yes

releases/WebKitGTK/webkit-2.2/Source/autotools/Versions.m4

@@ -18 +18 @@
 m4_define([gtk2_required_version], [2.24.10])
 m4_define([gtk3_required_version], [3.6.0])
++m4_define([gtk3_wayland_required_version], [3.9.14])
 
 m4_define([atspi2_required_version], [2.5.3])