2011-12-02 Alejandro G. Castro <alex@igalia.com>
authoralex@webkit.org <alex@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 16:16:07 +0000 (16:16 +0000)
committeralex@webkit.org <alex@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 16:16:07 +0000 (16:16 +0000)
        [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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
configure.ac

index 6e4d5a3..b5f3146 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-02  Alejandro G. Castro  <alex@igalia.com>
+
+        [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  <kubo@profusion.mobi>
 
         Unreviewed, revert r101347.
index b8703f9..05ee26e 100644 (file)
@@ -172,12 +172,12 @@ endif
 
 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
 
 # ----
index 435f037..811e44a 100644 (file)
@@ -1156,8 +1156,7 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 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"])