Changeset 156328 in webkit

Timestamp:

Sep 24, 2013 6:14:37 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Enable the Wayland target if GTK+ dependency is found
​https://bugs.webkit.org/show_bug.cgi?id=121704

Reviewed by Gustavo Noronha Silva.

The Wayland target should be enabled by default if the GTK+ dependency is of version 3.9.14 or later.

• Source/autotools/FindDependencies.m4: If the Wayland target was not strictly disabled, the GTK+ dependency

is tested if it can provide the Wayland GDK backend, and that the version of that backend matches the version
of the master GTK+ dependency for which we already tested. If found, the target is enabled, otherwise we either
warn or error out, depending on whether the build target was set to auto or completely disabled through configuration.

• Source/autotools/ReadCommandLineArguments.m4: Switch the default Wayland target status to 'auto', meaning

it will be disabled if the GTK+ dependency is not found.

• Source/autotools/Versions.m4: Require GTK+ 3.9.14 for the Wayland target only.

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2013-09-24  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Enable the Wayland target if GTK+ dependency is found
+        https://bugs.webkit.org/show_bug.cgi?id=121704
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The Wayland target should be enabled by default if the GTK+ dependency is of version 3.9.14 or later.
+
+        * Source/autotools/FindDependencies.m4: If the Wayland target was not strictly disabled, the GTK+ dependency
+        is tested if it can provide the Wayland GDK backend, and that the version of that backend matches the version
+        of the master GTK+ dependency for which we already tested. If found, the target is enabled, otherwise we either
+        warn or error out, depending on whether the build target was set to auto or completely disabled through configuration.
+        * Source/autotools/ReadCommandLineArguments.m4: Switch the default Wayland target status to 'auto', meaning
+        it will be disabled if the GTK+ dependency is not found.
+        * Source/autotools/Versions.m4: Require GTK+ 3.9.14 for the Wayland target only.
+
 2013-09-23  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/autotools/FindDependencies.m4

@@ -202 +202 @@
 fi
 
-if test "$enable_wayland_target" = "yes"; 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)
+if test "$enable_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
+        gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version
+    ], [enable_wayland_target=yes], [
+        if test "$enable_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.])
+            enable_wayland_target=no
+        fi
+    ])
 fi
 

trunk/Source/autotools/ReadCommandLineArguments.m4

@@ -59 +59 @@
 AC_MSG_RESULT([$with_gtk])
 
-default_build_targets="x11=yes wayland=no win32=no quartz=no directfb=no"
+default_build_targets="x11=yes wayland=auto win32=no quartz=no directfb=no"
 build_targets=""
 

trunk/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.10.0])
 
 m4_define([atspi2_required_version], [2.5.3])