Commit 0cf71c92 authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

[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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 91d528d4
2013-07-08 Zan Dobersek <zdobersek@igalia.com>
[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 <gustavo.noronha@collabora.com>
[GTK] Remove unsupported AC backends
......
......@@ -64,11 +64,14 @@ fi
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment