Title: [152454] trunk
- Revision
- 152454
- Author
- [email protected]
- Date
- 2013-07-08 08:54:26 -0700 (Mon, 08 Jul 2013)
Log Message
[Autoconf] Define WTF_USE_OPENGL when OpenGL was found
https://bugs.webkit.org/show_bug.cgi?id=118341
Reviewed by Gustavo Noronha Silva.
After r152275, WTF_USE_OPENGL is only defined if the accelerated compositing is enabled.
This breaks the build if disabling the accelerated compositing feature as the OpenGL-specific
code is not compiled anymore even if it's still required.
To avoid that, WTF_USE_OPENGL should be defined if OpenGL was found. The accelerated compositing
feature also relies on this condition, exiting the configuration process with an error otherwise.
* Source/autotools/SetupAutoconfHeader.m4:
Modified Paths
Diff
Modified: trunk/ChangeLog (152453 => 152454)
--- trunk/ChangeLog 2013-07-08 15:53:54 UTC (rev 152453)
+++ trunk/ChangeLog 2013-07-08 15:54:26 UTC (rev 152454)
@@ -1,3 +1,19 @@
+2013-07-08 Zan Dobersek <[email protected]>
+
+ [Autoconf] Define WTF_USE_OPENGL when OpenGL was found
+ https://bugs.webkit.org/show_bug.cgi?id=118341
+
+ Reviewed by Gustavo Noronha Silva.
+
+ After r152275, WTF_USE_OPENGL is only defined if the accelerated compositing is enabled.
+ This breaks the build if disabling the accelerated compositing feature as the OpenGL-specific
+ code is not compiled anymore even if it's still required.
+
+ To avoid that, WTF_USE_OPENGL should be defined if OpenGL was found. The accelerated compositing
+ feature also relies on this condition, exiting the configuration process with an error otherwise.
+
+ * Source/autotools/SetupAutoconfHeader.m4:
+
2013-07-01 Gustavo Noronha Silva <[email protected]>
[GTK] Remove unsupported AC backends
Modified: trunk/Source/autotools/SetupAutoconfHeader.m4 (152453 => 152454)
--- trunk/Source/autotools/SetupAutoconfHeader.m4 2013-07-08 15:53:54 UTC (rev 152453)
+++ trunk/Source/autotools/SetupAutoconfHeader.m4 2013-07-08 15:54:26 UTC (rev 152454)
@@ -64,11 +64,14 @@
if test "$enable_accelerated_compositing" = "yes"; then
AC_DEFINE([WTF_USE_ACCELERATED_COMPOSITING], [1], [ ])
- AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ])
fi
+if test "$found_opengl" = "yes"; then
+ AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
+fi
+
if test "$enable_glx" = "yes"; then
AC_DEFINE([WTF_USE_GLX], [1], [ ])
fi
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
