[GTK] Add compilation options to enable/disable Accelerated Compositing and to choose...
[WebKit-https.git] / configure.ac
index 3941bfca85880d028b711ed145a8c89170087c97..73a00015c6a51e803f9ffe58107623c33be8c3a5 100644 (file)
@@ -389,12 +389,12 @@ AC_MSG_RESULT([$enable_webgl])
 # check whether to enable accelerated compositing support
 AC_MSG_CHECKING([whether to enable accelerated compositing support])
 AC_ARG_WITH(accelerated_compositing,
-            AC_HELP_STRING([--with-accelerated-compositing],
+            AC_HELP_STRING([--with-accelerated-compositing=@<:@no/opengl/cairo@:>@],
                            [use accelerated compositing (experimental) [default=no]]),
             [], [with_accelerated_compositing="no"])
 AC_MSG_RESULT([$with_accelerated_compositing])
 
-if test "$enable_webgl" = "yes" || test "with_accelerated_compositing" = "yes"; then
+if test "$enable_webgl" = "yes" ||  test "$with_accelerated_compositing" = "opengl" ; then
     AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
     AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
     OPENGL_LIBS="-lGL -ldl"
@@ -1148,7 +1148,10 @@ 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" = "yes"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "cairo"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [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 feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])