Title: [101799] trunk
- Revision
- 101799
- Author
- [email protected]
- Date
- 2011-12-02 08:16:07 -0800 (Fri, 02 Dec 2011)
Log Message
2011-12-02 Alejandro G. Castro <[email protected]>
[GTK] Fix TextureMapperCairo compilation
https://bugs.webkit.org/show_bug.cgi?id=73655
Reviewed by Martin Robinson.
* GNUmakefile.am: The variables need the USE part in the name.
* configure.ac: We can not define the variable twice.
Modified Paths
Diff
Modified: trunk/ChangeLog (101798 => 101799)
--- trunk/ChangeLog 2011-12-02 16:14:29 UTC (rev 101798)
+++ trunk/ChangeLog 2011-12-02 16:16:07 UTC (rev 101799)
@@ -1,3 +1,13 @@
+2011-12-02 Alejandro G. Castro <[email protected]>
+
+ [GTK] Fix TextureMapperCairo compilation
+ https://bugs.webkit.org/show_bug.cgi?id=73655
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: The variables need the USE part in the name.
+ * configure.ac: We can not define the variable twice.
+
2011-12-02 Raphael Kubo da Costa <[email protected]>
Unreviewed, revert r101347.
Modified: trunk/GNUmakefile.am (101798 => 101799)
--- trunk/GNUmakefile.am 2011-12-02 16:14:29 UTC (rev 101798)
+++ trunk/GNUmakefile.am 2011-12-02 16:16:07 UTC (rev 101799)
@@ -172,12 +172,12 @@
if USE_TEXTURE_MAPPER_CAIRO
global_cppflags += \
- -DWTF_TEXTURE_MAPPER_CAIRO=1
+ -DWTF_USE_TEXTURE_MAPPER_CAIRO=1
endif
if USE_TEXTURE_MAPPER_GL
global_cppflags += \
- -DWTF_TEXTURE_MAPPER_OPENGL=1
+ -DWTF_USE_TEXTURE_MAPPER_OPENGL=1
endif
# ----
Modified: trunk/configure.ac (101798 => 101799)
--- trunk/configure.ac 2011-12-02 16:14:29 UTC (rev 101798)
+++ trunk/configure.ac 2011-12-02 16:16:07 UTC (rev 101799)
@@ -1156,8 +1156,7 @@
AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
# Accelerated compositing conditional
-AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "cairo"])
-AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "opengl"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "cairo" || test "$with_accelerated_compositing" = "opengl"])
AM_CONDITIONAL([USE_TEXTURE_MAPPER_CAIRO], [test "$with_accelerated_compositing" = "cairo"])
AM_CONDITIONAL([USE_TEXTURE_MAPPER_GL], [test "$with_accelerated_compositing" = "opengl"])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
