Another attempt at getting these expectations right for the bots.
[WebKit-https.git] / configure.ac
index a716286..7544b56 100644 (file)
@@ -1,17 +1,17 @@
-AC_PREREQ(2.59)
+AC_PREREQ(2.60)
 
 m4_define([webkit_major_version], [1])
-m4_define([webkit_minor_version], [9])
+m4_define([webkit_minor_version], [11])
 m4_define([webkit_micro_version], [2])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
 #
 # Sourced from Source/WebCore/Configurations/Version.xcconfig
-m4_define([webkit_user_agent_major_version], [536])
-m4_define([webkit_user_agent_minor_version], [10])
+m4_define([webkit_user_agent_major_version], [537])
+m4_define([webkit_user_agent_minor_version], [20])
 
-AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
+AC_INIT([WebKitGTK],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
 AC_CONFIG_MACRO_DIR([Source/autotools])
 AC_CONFIG_AUX_DIR([Source/autotools])
@@ -35,13 +35,13 @@ AC_CONFIG_SRCDIR([Source/WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-LIBWEBKITGTK_VERSION=13:1:13
+LIBWEBKITGTK_VERSION=17:1:17
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-LIBJAVASCRIPTCOREGTK_VERSION=13:1:13
+LIBJAVASCRIPTCOREGTK_VERSION=13:7:13
 AC_SUBST([LIBJAVASCRIPTCOREGTK_VERSION])
 
-LIBWEBKIT2GTK_VERSION=13:1:13
+LIBWEBKIT2GTK_VERSION=19:0:19
 AC_SUBST([LIBWEBKIT2GTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
@@ -105,6 +105,11 @@ if test -z "$PYTHON"; then
    AC_MSG_ERROR([You need 'python' to compile WebKit])
 fi
 
+AC_PATH_PROG(RUBY, ruby)
+if test -z "$RUBY"; then
+   AC_MSG_ERROR([You need 'ruby' to compile WebKit])
+fi
+
 AC_PATH_PROG(BISON, bison)
 if test -z "$BISON"; then
    AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit])
@@ -331,44 +336,12 @@ esac
 
 AC_MSG_RESULT([$with_target])
 
-AC_MSG_CHECKING([the GStreamer version to use])
-AC_ARG_WITH([gstreamer],
-        [AS_HELP_STRING([--with-gstreamer=0.10|1.0], [the GStreamer version to use (default: 0.10)])],
-        [case "$with_gstreamer" in
-        0.10|1.0) ;;
-        *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;
-        esac],
-        [with_gstreamer=0.10])
-AC_MSG_RESULT([$with_gstreamer])
-
-GSTREAMER_0_10_REQUIRED_VERSION=0.10
-GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
-GSTREAMER_1_0_REQUIRED_VERSION=1.0
-GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION=0.11.90
-
-case "$with_gstreamer" in
-     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-           GST_API_VERSION=0.10
-           ;;
-     1.0) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_1_0_REQUIRED_VERSION
-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION
-           GST_API_VERSION=1.0
-           ;;
-esac
-
-AC_SUBST([GST_API_VERSION])
-if test "$GST_API_VERSION" = "1.0"; then
-AC_DEFINE([GST_USE_UNSTABLE_API], [1], [Using unstable GStreamer API])
-AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])
-fi
-
 # minimum base dependencies
 CAIRO_REQUIRED_VERSION=1.10
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
 GLIB_REQUIRED_VERSION=2.32.0
-LIBSOUP_REQUIRED_VERSION=2.37.92
+LIBSOUP_REQUIRED_VERSION=2.40.0
 LIBXML_REQUIRED_VERSION=2.6
 PANGO_REQUIRED_VERSION=1.21.0
 
@@ -385,6 +358,11 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, :, gmodule gobject gthread gio)
 if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
    AC_MSG_ERROR([You need the GLib dev tools in your path])
 fi
+
+# GResources
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
+
 GLIB_GSETTINGS
 
 # Check and identify which unicode backend to use
@@ -522,224 +500,162 @@ AC_ARG_ENABLE(optimizations,
               [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
 AC_MSG_RESULT([$enable_optimizations])
 
-# check whether to enable WebGL support
-AC_MSG_CHECKING([whether to enable WebGL support])
-AC_ARG_ENABLE(webgl,
-              AC_HELP_STRING([--enable-webgl], [enable support for WebGL [default=yes]]),
-              [], [if test "$with_target" = "x11"; then enable_webgl="yes"; else enable_webgl="no"; fi])
-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=@<:@no/opengl/cairo/clutter@:>@],
-                           [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" = "opengl" ; then
-    if test "$with_target" != "x11"; then
-        AC_MSG_ERROR([OpenGL support is only available on X11 currently.])
-    fi
-    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"
+# check whether to enable unstable features
+AC_MSG_CHECKING([whether to enable unstable features])
+AC_ARG_ENABLE(unstable_features,
+              AC_HELP_STRING([--enable-unstable-features],
+                             [enable unstable features [default=no]]),
+              [],[enable_unstable_features="no"])
+AC_MSG_RESULT([$enable_unstable_features])
+
+found_opengl=no
+AC_ARG_ENABLE(glx,
+              AC_HELP_STRING([--enable-glx], [enable support for GLX [default=auto]]),
+              [], [enable_glx="auto"])
+AC_ARG_ENABLE(egl,
+              AC_HELP_STRING([--enable-egl], [enable support for EGL [default=auto]]),
+              [], [enable_egl="auto"])
+AC_ARG_ENABLE(gles2,
+              AC_HELP_STRING([--enable-gles2], [enable support for OpenGL ES 2 [default=auto]]),
+              [], [enable_gles2="auto"])
+
+have_glx=no
+AC_CHECK_HEADERS([GL/glx.h], [have_glx="yes"], [have_glx="no"])
+AC_MSG_CHECKING([whether to enable GLX support])
+if test "$enable_glx" != "no"; then
+   if test "$have_glx" = "no"; then
+      if test "$enable_glx" = "yes"; then
+         AC_MSG_ERROR([--enable-glx specified, but not available])
+      else
+         enable_glx=no
+      fi
+   elif test "$enable_gles2" != "yes"; then
+      enable_glx=yes
+   fi
 fi
-AC_SUBST([OPENGL_LIBS])
+AC_MSG_RESULT([$enable_glx])
+
+have_egl=no
+AC_CHECK_HEADERS([EGL/egl.h], [have_egl="yes"], [have_egl="no"])
+AC_MSG_CHECKING([whether to enable EGL support])
+if test "$enable_egl" != "no"; then
+   if test "$have_egl" = "no"; then
+      if test "$enable_egl" = "yes"; then
+         AC_MSG_ERROR([--enable-egl specified, but not available])
+      else
+         enable_egl=no
+      fi
+   else
+      enable_egl=yes
+   fi
+fi
+AC_MSG_RESULT([$enable_egl])
+
+have_gles2=no
+AC_CHECK_HEADERS([GLES2/gl2.h], [have_gles2="yes"], [have_gles2="no"])
+AC_MSG_CHECKING([whether to use OpenGL ES 2 support])
+if test "$enable_glx" = "yes"; then
+   if test "$enable_gles2" = "yes"; then
+      AC_MSG_ERROR([Cannot enable OpenGL ES 2 support with GLX])
+   else
+      enable_gles2=no
+   fi
+fi
+if test "$enable_egl" = "no"; then
+   if test "$enable_gles2" = "yes"; then
+      AC_MSG_ERROR([Cannot enable OpenGL ES 2 support without EGL])
+   else
+      enable_gles2=no
+   fi
+fi
+if test "$enable_gles2" != "no"; then
+   if test "$have_gles2" = "no"; then
+      if test "$enable_gles2" = "yes"; then
+         AC_MSG_ERROR([--enable-gles2 specified, but not available])
+      else
+         enable_gles2=no
+      fi
+   else
+      enable_gles2=yes
+      found_opengl=yes
+   fi
+fi
+AC_MSG_RESULT([$enable_gles2])
 
-if test "$with_accelerated_compositing" = "clutter"; then
-   PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-   PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
+if test "$enable_gles2" != "yes"; then
+    AC_CHECK_HEADERS([GL/gl.h], [found_opengl="yes"], [])
+fi
 
-   AC_SUBST(CLUTTER_CFLAGS)
-   AC_SUBST(CLUTTER_LIBS)
-   AC_SUBST(CLUTTER_GTK_CFLAGS)
-   AC_SUBST(CLUTTER_GTK_LIBS)
+AC_MSG_CHECKING([which GPU acceleration backend to use])
+AC_ARG_WITH(acceleration_backend,
+            AC_HELP_STRING([--with-acceleration-backend=@<:@opengl/clutter/none@:>@],
+                           [Select accelerated backend (Clutter currently unsupported, OpenGL autodetected) [default=autodetect]]), [],
+                           [
+                                if test "$found_opengl" = "yes"; then
+                                   with_acceleration_backend="opengl";
+                                else
+                                   with_acceleration_backend="none";
+                                fi
+                           ])
+AC_MSG_RESULT([$with_acceleration_backend])
+
+if test "$with_acceleration_backend" = "opengl"; then
+    PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite]);
+    PKG_CHECK_MODULES([XDAMAGE], [xdamage]);
+    AC_SUBST(XCOMPOSITE_CFLAGS)
+    AC_SUBST(XCOMPOSITE_LIBS)
+    AC_SUBST(XDAMAGE_CFLAGS)
+    AC_SUBST(XDAMAGE_LIBS)
 fi
 
-# check whether to enable channel messaging support
-AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
-AC_ARG_ENABLE(channel_messaging,
-              AC_HELP_STRING([--enable-channel-messaging],
-                             [enable HTML5 channel messaging support [default=yes]]),
-              [],[enable_channel_messaging="yes"])
-AC_MSG_RESULT([$enable_channel_messaging])
-
-# check whether to enable legacy notifications
-AC_MSG_CHECKING([whether to enable legacy notifications])
-AC_ARG_ENABLE(legacy_notifications,
-              AC_HELP_STRING([--enable-legacy-notifications],
-                             [enable legacy notifications [default=no]]),
-              [],[enable_legacy_notifications="no"])
-AC_MSG_RESULT([$enable_legacy_notifications])
-
-# check whether to enable notifications
-AC_MSG_CHECKING([whether to enable notifications])
-AC_ARG_ENABLE(notifications,
-              AC_HELP_STRING([--enable-notifications],
-                             [enable notifications [default=no]]),
-              [],[enable_notifications="no"])
-AC_MSG_RESULT([$enable_notifications])
-
-# check whether to enable the meter tag
-AC_MSG_CHECKING([whether to enable HTML5 meter tag])
-AC_ARG_ENABLE(meter_tag,
-              AC_HELP_STRING([--enable-meter-tag],
-                             [enable HTML5 meter [default=yes]]),
-              [],[enable_meter_tag="yes"])
-AC_MSG_RESULT([$enable_meter_tag])
-
-# check whether to enable HTML5 Microdata support
-AC_MSG_CHECKING([whether to enable HTML5 Microdata support])
-AC_ARG_ENABLE(microdata,
-              AC_HELP_STRING([--enable-microdata],
-                             [enable HTML5 microdata support [default=no]]),
-              [],[enable_microdata="no"])
-AC_MSG_RESULT([$enable_microdata])
-
-# check whether to enable page visibility API.
-AC_MSG_CHECKING([whether to enable Page Visibility API support])
-AC_ARG_ENABLE(page_visibility_api,
-              AC_HELP_STRING([--enable-page-visibility-api],
-                             [enable page visibility api[default=no]]),
-              [],[enable_page_visibility_api="no"])
-AC_MSG_RESULT([$enable_page_visibility_api])
-
-# check whether to enable the progress tag
-AC_MSG_CHECKING([whether to enable HTML5 progress tag])
-AC_ARG_ENABLE(progress_tag,
-              AC_HELP_STRING([--enable-progress-tag],
-                             [enable HTML5 progress [default=yes]]),
-              [],[enable_progress_tag="yes"])
-AC_MSG_RESULT([$enable_progress_tag])
-
-# check whether to enable JavaScript debugger/profiler support
-AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
-AC_ARG_ENABLE(javascript_debugger,
-              AC_HELP_STRING([--enable-javascript-debugger],
-                             [enable JavaScript debugger/profiler support [default=yes]]),
-              [],[enable_javascript_debugger="yes"])
-AC_MSG_RESULT([$enable_javascript_debugger])
+# OpenGL is turned on by default (along with WebGL and accelerated compositing), but if
+# Clutter is chosen as the accelerated drawing backend, we want to disable it. COGL does 
+# not play well with OpenGL.
+AC_MSG_CHECKING([whether to enable WebGL support])
+AC_ARG_ENABLE(webgl,
+              AC_HELP_STRING([--enable-webgl], [enable support for WebGL [default=check]]), [],
+              [
+                if test "$with_acceleration_backend" = "opengl"; then
+                    enable_webgl="yes";
+                else
+                    enable_webgl="no";
+                fi
+             ])
+AC_MSG_RESULT([$enable_webgl])
+if test "$enable_webgl" = "yes" && test "$with_acceleration_backend" != "opengl"; then
+    AC_MSG_ERROR([OpenGL must be active (and Clutter disabled) to use WebGL.])
+fi;
+
+AC_MSG_CHECKING([whether to enable accelerated compositing support])
+AC_ARG_ENABLE(accelerated_compositing,
+            AC_HELP_STRING([--enable-accelerated-compositing], [enable support for accelerated compositing [default=check]]),
+            [
+                if test "$enableval" = "yes" && test "$with_acceleration_backend" = "none"; then
+                    AC_MSG_ERROR([OpenGL or Clutter must be active to use accelerated compositing.])
+                fi
+                enable_accelerated_compositing=$enableval;
+            ],
+            [
+                if test "$with_acceleration_backend" != "none"; then
+                    enable_accelerated_compositing="yes";
+                else
+                    enable_accelerated_compositing="no";
+                fi
+            ])
+AC_MSG_RESULT([$enable_accelerated_compositing])
 
 # check whether to enable Gamepad support
 AC_MSG_CHECKING([whether to enable Gamepad support])
 AC_ARG_ENABLE(gamepad,
               AC_HELP_STRING([--enable-gamepad],
                              [enable Gamepad support [default=no]]),
-              [],[enable_gamepad="no"])
+              [],[enable_gamepad=$enable_unstable_features])
 AC_MSG_RESULT([$enable_gamepad])
 
-# check whether to build with datagrid support
-AC_MSG_CHECKING([whether to enable HTML5 datagrid support])
-AC_ARG_ENABLE(datagrid,
-              AC_HELP_STRING([--enable-datagrid],
-                             [enable HTML5 datagrid support [default=no]]),
-              [],[enable_datagrid="no"])
-AC_MSG_RESULT([$enable_datagrid])
-
-# check whether to build with data transfer items support
-AC_MSG_CHECKING([whether to enable HTML5 data transfer items support])
-AC_ARG_ENABLE(data_transfer_items,
-              AC_HELP_STRING([--enable-data-transfer-items],
-                             [enable HTML5 data transfer items support [default=no]]),
-              [],[enable_data_transfer_items="no"])
-AC_MSG_RESULT([$enable_data_transfer_items])
-
-# check whether to enable DOM mutation observer support
-AC_MSG_CHECKING([whether to enable DOM mutation observer support])
-AC_ARG_ENABLE(mutation_observers,
-              AC_HELP_STRING([--enable-mutation-observers],
-                             [enable DOM mutation observer support [default=no]]),
-              [],[enable_mutation_observers="no"])
-AC_MSG_RESULT([$enable_mutation_observers])
-
-# check whether to enable HTML5 client-side session and persitent storage support
-AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
-AC_ARG_ENABLE(dom_storage,
-              AC_HELP_STRING([--enable-dom-storage],
-                             [enable HTML5 client-side session and persistent storage support [default=yes]]),
-              [],[enable_dom_storage="yes"])
-AC_MSG_RESULT([$enable_dom_storage])
-
-# check whether to enable the indexed database API
-AC_MSG_CHECKING([whether to enable the indexed database API])
-AC_ARG_ENABLE(indexed_database,
-              AC_HELP_STRING([--enable-indexed-database],
-                             [enable the indexed database API (incomplete) [default=no]]),
-              [],[enable_indexed_database="no"])
-AC_MSG_RESULT([$enable_indexed_database])
-
-# check whether to enable the color input
-AC_MSG_CHECKING([whether to enable the color input])
-AC_ARG_ENABLE(input_type_color,
-              AC_HELP_STRING([--enable-input-type-color],
-                             [enable the color input [default=no]]),
-              [],[enable_input_type_color="no"])
-AC_MSG_RESULT([$enable_input_type_color])
-
-# check whether to enable the speech input API
-AC_MSG_CHECKING([whether to enable the speech input API])
-AC_ARG_ENABLE(input_speech,
-              AC_HELP_STRING([--enable-input-speech],
-                             [enable the speech input API [default=no]]),
-              [],[enable_input_speech="no"])
-AC_MSG_RESULT([$enable_input_speech])
-
-# check whether to enable the scripted speech API
-AC_MSG_CHECKING([whether to enable the scripted speech API])
-AC_ARG_ENABLE(scripted_speech,
-              AC_HELP_STRING([--enable-scripted-speech],
-                             [enable the scripted speech API [default=no]]),
-              [],[enable_scripted_speech="no"])
-AC_MSG_RESULT([$enable_scripted_speech])
-
-# check whether to build with SQL database support
-AC_MSG_CHECKING([whether to enable SQL client-side database storage support])
-AC_ARG_ENABLE(sql_database,
-              AC_HELP_STRING([--enable-sql-database],
-                             [enable SQL client-side database storage support [default=yes]]),
-              [],[enable_sql_database="yes"])
-AC_MSG_RESULT([$enable_sql_database])
-
-# check whether to build with icon database support
-AC_MSG_CHECKING([whether to enable icon database support])
-AC_ARG_ENABLE(icon_database,
-              AC_HELP_STRING([--enable-icon-database],
-                             [enable icon database [default=yes]]),
-              [],[enable_icon_database="yes"])
-AC_MSG_RESULT([$enable_icon_database])
-
-# check whether to build with image resizer API support
-AC_MSG_CHECKING([whether to enable image resizer API support])
-AC_ARG_ENABLE(image_resizer,
-              AC_HELP_STRING([--enable-image-resizer],
-                             [enable image resizer [default=no]]),
-              [],[enable_image_resizer="no"])
-AC_MSG_RESULT([$enable_image_resizer])
-
-# check whether to enable HTML5 datalist support
-AC_MSG_CHECKING([whether to enable HTML5 datalist support])
-AC_ARG_ENABLE(datalist,
-              AC_HELP_STRING([--enable-datalist],
-                             [enable HTML5 datalist support [default=yes]]),
-              [],[enable_datalist="yes"])
-AC_MSG_RESULT([$enable_datalist])
-
-# check whether to enable HTML5 sandbox iframe support
-AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
-AC_ARG_ENABLE(sandbox,
-              AC_HELP_STRING([--enable-sandbox],
-                             [enable HTML5 sandboxed iframe support [default=yes]]),
-              [],[enable_sandbox="yes"])
-AC_MSG_RESULT([$enable_sandbox])
-
-# check whether to enable HTML5 iframe seamless attribute support
-AC_MSG_CHECKING([whether to enable HTML5 iframe seamless attribute support])
-AC_ARG_ENABLE(iframe-seamless,
-              AC_HELP_STRING([--enable-iframe-seamless],
-                             [enable HTML5 iframe seamless attribute support [default=yes]]),
-              [],[enable_iframe_seamless="yes"])
-AC_MSG_RESULT([$enable_sandbox])
+if test "$enable_gamepad" = "yes" && test "$os_linux" = no; then
+   AC_MSG_WARN([Gamepad support is only available on Linux. Disabling Gamepad support.])
+   enable_gamepad=no;
+fi
 
 # check whether to enable HTML5 audio/video support
 AC_MSG_CHECKING([whether to enable HTML5 video support])
@@ -749,49 +665,12 @@ AC_ARG_ENABLE(video,
               [],[enable_video="yes"])
 AC_MSG_RESULT([$enable_video])
 
-# turn off video features if --disable-video is requested
-if test "$enable_video" = "no"; then
-   enable_video_track=no
-fi
-
-# check whether to enable HTML5 video track support
-AC_MSG_CHECKING([whether to enable HTML5 video track support])
-AC_ARG_ENABLE(video_track,
-              AC_HELP_STRING([--enable-video-track],
-                             [enable HTML5 video track support [default=no]]),
-              [],[enable_video_track="no"])
-AC_MSG_RESULT([$enable_video_track])
-
-# check whether to enable media source support
-AC_MSG_CHECKING([whether to enable media source support])
-AC_ARG_ENABLE(media_source,
-              AC_HELP_STRING([--enable-media-source],
-                             [enable support for media source [default=no]]),
-              [], [enable_media_source="no"])
-AC_MSG_RESULT([$enable_media_source])
-
-# check whether to enable media statistics support
-AC_MSG_CHECKING([whether to enable media statistics support])
-AC_ARG_ENABLE(media_statistics,
-              AC_HELP_STRING([--enable-media-statistics],
-                             [enable support for media statistics [default=no]]),
-              [], [enable_media_statistics="no"])
-AC_MSG_RESULT([$enable_media_statistics])
-
-# check whether to enable Javascript Fullscreen API support
-AC_MSG_CHECKING([whether to enable Fullscreen API support])
-AC_ARG_ENABLE(fullscreen_api,
-              AC_HELP_STRING([--enable-fullscreen-api],
-                             [enable the Fullscreen API support [default=yes]]),
-              [],[enable_fullscreen_api="yes"])
-AC_MSG_RESULT([$enable_fullscreen_api])
-
 # check whether to enable media stream support
 AC_MSG_CHECKING([whether to enable media stream support])
 AC_ARG_ENABLE(media_stream,
               AC_HELP_STRING([--enable-media-stream],
                              [enable media stream support (incomplete) [default=no]]),
-              [],[enable_media_stream="no"])
+              [],[enable_media_stream=$enable_unstable_features])
 AC_MSG_RESULT([$enable_media_stream])
 
 # check whether to enable XSLT support
@@ -810,22 +689,6 @@ AC_ARG_ENABLE(geolocation,
               [],[enable_geolocation="yes"])
 AC_MSG_RESULT([$enable_geolocation])
 
-# check whether to enable MathML support
-AC_MSG_CHECKING([whether to enable MathML support])
-AC_ARG_ENABLE(mathml,
-              AC_HELP_STRING([--enable-mathml],
-                             [enable support for MathML [default=yes]]),
-              [],[enable_mathml="yes"])
-AC_MSG_RESULT([$enable_mathml])
-
-# check whether to enable MHTML support
-AC_MSG_CHECKING([whether to enable MHTML support])
-AC_ARG_ENABLE(mhtml,
-              AC_HELP_STRING([--enable-mhtml],
-                             [enable support for MHTML [default=no]]),
-              [],[enable_mhtml="no"])
-AC_MSG_RESULT([$enable_mhtml])
-
 # check whether to enable SVG support
 AC_MSG_CHECKING([whether to enable SVG support])
 AC_ARG_ENABLE(svg,
@@ -834,75 +697,11 @@ AC_ARG_ENABLE(svg,
               [],[enable_svg="yes"])
 AC_MSG_RESULT([$enable_svg])
 
-# check whether to enable Shadow DOM support
-AC_MSG_CHECKING([whether to enable Shadow DOM support])
-AC_ARG_ENABLE(shadow_dom,
-              AC_HELP_STRING([--enable-shadow-dom],
-                             [enable support for Shadow DOM [default=yes]]),
-              [],[enable_shadow_dom="yes"])
-AC_MSG_RESULT([$enable_shadow_dom])
-
-# check whether to enable SharedWorkers support
-AC_MSG_CHECKING([whether to enable SharedWorkers support])
-AC_ARG_ENABLE(shared_workers,
-              AC_HELP_STRING([--enable-shared-workers],
-                             [enable support for SharedWorkers [default=yes]]),
-              [],[enable_shared_workers="yes"])
-AC_MSG_RESULT([$enable_shared_workers])
-
-# check whether to enable Web Workers support
-AC_MSG_CHECKING([whether to enable Web Workers support])
-AC_ARG_ENABLE(workers,
-              AC_HELP_STRING([--enable-workers],
-                             [enable support for Web Workers [default=yes]]),
-              [],[enable_workers="yes"])
-AC_MSG_RESULT([$enable_workers])
-
-# check whether to enable directory upload support
-AC_MSG_CHECKING([whether to enable directory upload support])
-AC_ARG_ENABLE(directory_upload,
-              AC_HELP_STRING([--enable-directory-upload],
-                             [enable support for directory upload [default=no]]),
-              [], [enable_directory_upload="no"])
-AC_MSG_RESULT([$enable_directory_upload])
-
-# check whether to enable HTML5 FileSystem API support
-AC_MSG_CHECKING([whether to enable HTML5 FileSystem API support])
-AC_ARG_ENABLE(file_system,
-              AC_HELP_STRING([--enable-file-system],
-                             [enable support for HTML5 FileSystem API [default=no]]),
-              [], [enable_file_system="no"])
-AC_MSG_RESULT([$enable_file_system])
-
-# check whether to enable HTML5 <style scoped> support
-AC_MSG_CHECKING([whether to enable HTML5 <style scoped> support])
-AC_ARG_ENABLE(style_scoped,
-              AC_HELP_STRING([--enable-style-scoped],
-                             [enable support for HTML5 <style scoped> [default=no]]),
-              [], [enable_style_scoped="no"])
-AC_MSG_RESULT([$enable_style_scoped])
-
-# check whether to enable Quota API support
-AC_MSG_CHECKING([whether to enable Quota API support])
-AC_ARG_ENABLE(quota,
-              AC_HELP_STRING([--enable-quota],
-                             [enable support for Quota API [default=no]]),
-              [], [enable_quota="no"])
-AC_MSG_RESULT([$enable_quota])
-
 # turn off svg features if --disable-svg is requested
 if test "$enable_svg" = "no"; then
    enable_svg_fonts=no
 fi
 
-# check whether to enable support for filters
-AC_MSG_CHECKING([whether to enable support for filters])
-AC_ARG_ENABLE(filters,
-              AC_HELP_STRING([--enable-filters],
-                             [enable support for filters (experimental) [default=yes]]),
-              [],[enable_filters="yes"])
-AC_MSG_RESULT([$enable_filters])
-
 # check whether to enable support for SVG fonts
 AC_MSG_CHECKING([whether to enable support for SVG fonts])
 AC_ARG_ENABLE(svg_fonts,
@@ -912,22 +711,11 @@ AC_ARG_ENABLE(svg_fonts,
 AC_MSG_RESULT([$enable_svg_fonts])
 
 # check for SVG features, enabling SVG if necessary
-if test "$enable_svg_fonts" = "yes"; then
-   svg_flags=yes
-   if test "$enable_svg" = "no"; then
-       AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
-       enable_svg=yes
-   fi
+if test "$enable_svg_fonts" = "yes" && test "$enable_svg" = "no"; then
+   AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
+   enable_svg=yes
 fi
 
-# check whether to enable Web Socket support
-AC_MSG_CHECKING([whether to enable Web Sockets support])
-AC_ARG_ENABLE(web_sockets,
-              AC_HELP_STRING([--enable-web-sockets],
-                             [enable support for Web Sockets [default=yes]]),
-              [],[enable_web_sockets="yes"])
-AC_MSG_RESULT([$enable_web_sockets])
-
 # check whether to enable Web Audio support
 AC_MSG_CHECKING([whether to enable Web Audio support])
 AC_ARG_ENABLE(web_audio,
@@ -936,38 +724,6 @@ AC_ARG_ENABLE(web_audio,
               [],[enable_web_audio="no"])
 AC_MSG_RESULT([$enable_web_audio])
 
-# check whether to enable Web Timing support
-AC_MSG_CHECKING([whether to enable Web Timing support])
-AC_ARG_ENABLE(web_timing,
-              AC_HELP_STRING([--enable-web-timing],
-                             [enable support for Web Timing [default=no]]),
-              [],[enable_web_timing="no"])
-AC_MSG_RESULT([$enable_web_timing])
-
-# check whether to enable Blob support
-AC_MSG_CHECKING([whether to enable Blob support])
-AC_ARG_ENABLE(blob,
-              AC_HELP_STRING([--enable-blob],
-                             [enable support for Blob [default=yes]]),
-              [],[enable_blob="yes"])
-AC_MSG_RESULT([$enable_blob])
-
-# check whether to enable Legacy WebKitBlobBuilder support
-AC_MSG_CHECKING([whether to enable Legacy WebKitBlobBuilder support])
-AC_ARG_ENABLE(legacy_webkit_blob_builder,
-              AC_HELP_STRING([--enable-legacy-webkit-blob-builder],
-                             [enable support for Legacy WebKitBlobBuilder [default=yes]]),
-              [],[enable_legacy_webkit_blob_builder="yes"])
-AC_MSG_RESULT([$legacy_webkit_blob_builder])
-
-# check whether to enable Fast Mobile Scrolling support
-AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
-AC_ARG_ENABLE(fast_mobile_scrolling,
-              AC_HELP_STRING([--enable-fast-mobile-scrolling],
-                             [enable support for Fast Mobile Scrolling [default=no]]),
-              [],[enable_fast_mobile_scrolling="no"])
-AC_MSG_RESULT([$enable_fast_mobile_scrolling])
-
 # check whether to enable code coverage
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
@@ -987,11 +743,68 @@ AC_MSG_RESULT([$enable_fast_malloc])
 # check whether to enable debug symbols
 AC_MSG_CHECKING([whether to enable debug symbols])
 AC_ARG_ENABLE(debug_symbols,
-              AC_HELP_STRING([--enable-debug-symbols],
+              AC_HELP_STRING([--enable-debug-symbols=yes|no|min|full],
                              [enable debug symbols default=no, default=yes for debug builds]),
               [],[if test "$enable_debug" = "yes"; then enable_debug_symbols="yes"; else enable_debug_symbols="no"; fi])
+
+case "$enable_debug_symbols" in
+  yes) enable_debug_symbols="full" ;;
+  no|min|full) ;;
+  *) AC_MSG_ERROR([Invalid debug symbols option: must be yes, no, min or full.]) ;;
+esac
 AC_MSG_RESULT([$enable_debug_symbols])
 
+#selecting GStreamer version
+AC_MSG_CHECKING([the GStreamer version to use])
+AC_ARG_WITH([gstreamer],
+        [AS_HELP_STRING([--with-gstreamer=1.0|0.10|auto], [the GStreamer version to use (default: auto, tries 1.0 first, 0.10 is fallback)])],
+        [case "$with_gstreamer" in
+        0.10|1.0|auto) ;;
+        *) AC_MSG_ERROR([invalid GStreamer version specified]) ;;
+        esac],
+        [with_gstreamer=auto])
+AC_MSG_RESULT([$with_gstreamer])
+
+GSTREAMER_0_10_REQUIRED_VERSION=0.10
+GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
+GSTREAMER_1_0_REQUIRED_VERSION=1.0.3
+GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION=1.0.3
+
+if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
+   if test "$with_gstreamer" = "auto"; then
+       gstreamer_modules="gstreamer-1.0 >= $GSTREAMER_1_0_REQUIRED_VERSION
+                          gstreamer-app-1.0
+                          gstreamer-audio-1.0
+                          gstreamer-fft-1.0
+                          gstreamer-base-1.0
+                          gstreamer-pbutils-1.0
+                          gstreamer-plugins-base-1.0 >= $GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION
+                          gstreamer-video-1.0";
+       PKG_CHECK_MODULES([GSTREAMER_1_0], [$gstreamer_modules], [with_gstreamer=1.0], [with_gstreamer=0.10])
+       AC_MSG_NOTICE([Selected GStreamer $with_gstreamer])
+   fi
+else
+   if test "$with_gstreamer" != "auto"; then
+       AC_MSG_WARN([You have specified GStreamer $with_gstreamer version but it will not be used because neither HTML5 Video nor Web Audio are enabled])
+   fi
+fi
+
+case "$with_gstreamer" in
+     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=0.10
+           ;;
+     1.0) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_1_0_REQUIRED_VERSION
+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_1_0_PLUGINS_BASE_REQUIRED_VERSION
+           GST_API_VERSION=1.0
+           ;;
+esac
+
+AC_SUBST([GST_API_VERSION])
+if test "$GST_API_VERSION" = "1.0"; then
+   AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])
+fi
+
 # check whether to enable debug features
 AC_MSG_CHECKING([whether to enable debug features])
 AC_ARG_ENABLE(debug_features,
@@ -1026,17 +839,6 @@ if test "$enable_opcode_stats" = "yes"; then
   AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
 fi
 
-# Link prefetch
-AC_MSG_CHECKING([whether to enable link prefetch support])
-AC_ARG_ENABLE([link-prefetch],
-  [AS_HELP_STRING([--enable-link-prefetch], [Enable Link prefetch support (default: disabled)])],
-  [],[enable_link_prefetch=no])
-AC_MSG_RESULT([$enable_link_prefetch])
-
-if test "$enable_link_prefetch" = "yes"; then 
-  AC_DEFINE([ENABLE_LINK_PREFETCH], [1], [Define to enable link prefetch support])
-fi
-
 # GObject Introspection
 AC_MSG_CHECKING([whether to enable GObject introspection support])
 AC_ARG_ENABLE([introspection],
@@ -1044,45 +846,15 @@ AC_ARG_ENABLE([introspection],
   [],[enable_introspection=no])
 AC_MSG_RESULT([$enable_introspection])
 
-# check whether to enable animation API
-AC_MSG_CHECKING([whether to enable Animation API support])
-AC_ARG_ENABLE(animation_api,
-              AC_HELP_STRING([--enable-animation-api],
-                             [enable support for Animation API (experimental) [default=no]]),
-              [], [enable_animation_api="no"])
-AC_MSG_RESULT([$enable_animation_api])
-
-# check whether to enable requestAnimationFrame support
-AC_MSG_CHECKING([whether to enable requestAnimationFrame support])
-AC_ARG_ENABLE(request_animation_frame,
-              AC_HELP_STRING([--enable-request-animation-frame],
-                             [enable support for requestAnimationFrame (experimental) [default=yes]]),
-              [],[enable_request_animation_frame="yes"])
-AC_MSG_RESULT([$enable_request_animation_frame])
-
-# check whether to enable touch icon loading 
-AC_MSG_CHECKING([whether to enable touch icon loading])
-AC_ARG_ENABLE(touch_icon_loading,
-              AC_HELP_STRING([--enable-touch-icon-loading],
-                             [enable support for loading touch icons [default=no]]),
-              [], [enable_touch_icon_loading="no"])
-AC_MSG_RESULT([$enable_touch_icon_loading])
-
-# check whether to enable Register Protocol Handler support
-AC_MSG_CHECKING([whether to enable Register Protocol Handler])
-AC_ARG_ENABLE(register_protocol_handler,
-              AC_HELP_STRING([--enable-register-protocol-handler],
-                             [enable support for Register Protocol Handler (experimental) [default=no]]),
-              [],[enable_register_protocol_handler="no"])
-AC_MSG_RESULT([$enable_register_protocol_handler])
-
-# check whether to enable DeviceOrientation support
-AC_MSG_CHECKING([whether to enable DeviceOrientation])
-AC_ARG_ENABLE(device_orientation,
-              AC_HELP_STRING([--enable-device-orientation],
-                             [enable support for DeviceOrientation (experimental and incomplete) [default=no]]),
-              [],[enable_device_orientation="no"])
-AC_MSG_RESULT([$enable_device_orientation])
+# Enable CSS Filters and Shaders if unstable_features and accelerated_compositing are turned on.
+enable_css_filters=no;
+enable_css_shaders=no;
+AC_MSG_CHECKING([whether to enable CSS Filters and Shaders])
+if test "$enable_unstable_features" = "yes" && test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"; then
+    enable_css_filters=yes;
+    enable_css_shaders=yes;
+fi
+AC_MSG_RESULT([$enable_css_filters])
 
 G_IR_SCANNER=
 G_IR_COMPILER=
@@ -1104,26 +876,16 @@ AC_SUBST([G_IR_SCANNER])
 AC_SUBST([G_IR_COMPILER])
 AC_SUBST([G_IR_GENERATE])
 
-# determine the font backend
-AC_MSG_CHECKING([the font backend to use])
-AC_ARG_WITH(font_backend,
-            AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@],
-                           [Select font backend [default=freetype]]),
-            [],[with_font_backend="freetype"])
-
-case "$with_font_backend" in
-     freetype|pango) ;;
-     *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;;
-esac
-AC_MSG_RESULT([$with_font_backend])
-
 if test "$host_cpu" = "sh4"; then
    CXXFLAGS="$CXXFLAGS -mieee -w"
    CFLAGS="$CFLAGS -mieee -w"
 fi
 
 # Add '-g' flag to gcc to build with debug symbols
-if test "$enable_debug_symbols" = "yes"; then
+if test "$enable_debug_symbols" = "min"; then
+   CXXFLAGS="$CXXFLAGS -g1"
+   CFLAGS="$CFLAGS -g1"
+elif test "$enable_debug_symbols" != "no"; then
    CXXFLAGS="$CXXFLAGS -g"
    CFLAGS="$CFLAGS -g"
 fi
@@ -1146,21 +908,25 @@ PKG_CHECK_MODULES([LIBSOUP],
 AC_SUBST([LIBSOUP_CFLAGS])
 AC_SUBST([LIBSOUP_LIBS])
 
+PKG_CHECK_MODULES([LIBSECRET], [libsecret-1])
+AC_SUBST([LIBSECRET_CFLAGS])
+AC_SUBST([LIBSECRET_LIBS])
+
 # check if FreeType/FontConfig are available
-if test "$with_font_backend" = "freetype"; then
-   if test "$with_target" = "directfb"; then
-   PKG_CHECK_MODULES([FREETYPE],
-                     [fontconfig >= $FONTCONFIG_REQUIRED_VERSION
-                     freetype2 >= $FREETYPE2_REQUIRED_VERSION])
-   else
-   PKG_CHECK_MODULES([FREETYPE],
-                     [cairo-ft
-                     fontconfig >= $FONTCONFIG_REQUIRED_VERSION
-                     freetype2 >= $FREETYPE2_REQUIRED_VERSION])
-   fi
-   AC_SUBST([FREETYPE_CFLAGS])
-   AC_SUBST([FREETYPE_LIBS])
+if test "$with_target" = "directfb"; then
+PKG_CHECK_MODULES([FREETYPE],
+                  [fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+                  freetype2 >= $FREETYPE2_REQUIRED_VERSION
+                  harfbuzz])
+else
+PKG_CHECK_MODULES([FREETYPE],
+                  [cairo-ft
+                  fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+                  freetype2 >= $FREETYPE2_REQUIRED_VERSION
+                  harfbuzz])
 fi
+AC_SUBST([FREETYPE_CFLAGS])
+AC_SUBST([FREETYPE_LIBS])
 
 # check if SQLite3 is available. Error out only if one of the
 # features hard-depending on it is enabled while SQLite3 is
@@ -1221,8 +987,23 @@ if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
    AC_SUBST([GSTREAMER_LIBS])
 fi
 
+# farstream-0.1 depends on gstreamer 0.10 currently. Disable
+# media_stream if gstreamer 1.0 build support is enabled.
+if test "$have_gstreamer" != "yes" || test "$GST_API_VERSION" = "1.0"; then
+   if test "$enable_media_stream" = "yes"; then
+      AC_MSG_WARN([Disabling Media Stream because no GStreamer 0.10 support is enabled])
+   fi
+   enable_media_stream=false
+fi
+if test "$enable_media_stream" = "yes"; then
+   PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1],
+                     [have_farstream=yes], [enable_media_stream=false])
+   AC_SUBST([FARSTREAM_CFLAGS])
+   AC_SUBST([FARSTREAM_LIBS])
+fi
 
-if test "$with_accelerated_compositing" = "clutter"; then
+acceleration_backend_description=$with_acceleration_backend
+if test "$with_acceleration_backend" = "clutter"; then
    PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
    PKG_CHECK_MODULES([CLUTTER_GTK],
                      [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
@@ -1233,14 +1014,31 @@ if test "$with_accelerated_compositing" = "clutter"; then
    AC_SUBST(CLUTTER_GTK_LIBS)
 fi
 
-# check if atspi2 is available (only needed for Webkit2 unit tests)
-if test "$enable_webkit2" = "yes"; then
-   PKG_CHECK_MODULES([ATSPI2],
-                     [atspi-2 >= $ATSPI2_REQUIRED_VERSION],
-                     [have_atspi2=yes], [have_atspi2=no])
+if test "$with_acceleration_backend" = "opengl"; then
+   if test "$enable_gles2" = "yes"; then
+    acceleration_backend_description+= "(gles2"
+    OPENGL_LIBS="-lGLESv2"
+   else
+    acceleration_backend_description+="(gl"
+    OPENGL_LIBS="-lGL"
+   fi
+   if test "$enable_egl" = "yes"; then
+    acceleration_backend_description+=", egl"
+    OPENGL_LIBS+=" -lEGL"
+   fi
+   if test "$enable_glx" = "yes"; then
+    acceleration_backend_description+=", glx"
+   fi
+   OPENGL_LIBS+=" -ldl"
+   acceleration_backend_description+=")"
+fi
+AC_SUBST([OPENGL_LIBS])
 
-   AC_SUBST([ATSPI2_CFLAGS])
-   AC_SUBST([ATSPI2_LIBS])
+if test "$enable_gamepad" = "yes"; then
+   PKG_CHECK_MODULES([GAMEPAD], [gio-unix-2.0 gudev-1.0])
+
+   AC_SUBST(GAMEPAD_CFLAGS)
+   AC_SUBST(GAMEPAD_LIBS)
 fi
 
 # check for code coverage support
@@ -1251,11 +1049,6 @@ if test "$enable_coverage" = "yes"; then
    AC_SUBST([COVERAGE_LDFLAGS])
 fi
 
-# check for HTML features
-if test "$enable_video" = "yes"; then
-    html_flags=yes
-fi
-
 # WebKit2
 # If you change the default here, please also make sure the assumptions made
 # in Tools/Scripts/webkitdirs.pm:buildAutotoolsProject still make sense.
@@ -1278,6 +1071,13 @@ if test "$enable_webkit2" = "yes"; then
    if test "$have_gtk_unix_printing" = "yes"; then
        AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
    fi
+
+   # On some Linux/Unix platforms, shm_* may only be available if linking
+   # against librt
+   if test "$os_win32" = "no"; then
+       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
+       AC_SUBST(SHM_LIBS)
+   fi
 fi
 
 # Plugin Process
@@ -1301,6 +1101,16 @@ AC_SUBST(GTK2_LIBS)
 
 GTK_DOC_CHECK([1.10])
 
+# We need atspi2 for Webkit2 unit tests
+if test "$enable_webkit2" = "yes"; then
+   PKG_CHECK_MODULES([ATSPI2],
+                     [atspi-2 >= $ATSPI2_REQUIRED_VERSION],
+                     [have_atspi2=yes], [have_atspi2=no])
+
+   AC_SUBST([ATSPI2_CFLAGS])
+   AC_SUBST([ATSPI2_LIBS])
+fi
+
 # OS conditionals
 AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
 AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"])
@@ -1318,10 +1128,6 @@ AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
 AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
 AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
 
-# Font backend conditionals
-AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
-AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
-
 # GStreamer feature conditional
 AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
 AM_CONDITIONAL([USE_WEBAUDIO_GSTREAMER], [test "$enable_web_audio" = "yes"])
@@ -1330,83 +1136,40 @@ AM_CONDITIONAL([USE_WEBAUDIO_GSTREAMER], [test "$enable_web_audio" = "yes"])
 AM_CONDITIONAL([HAVE_ATSPI2], [test "$have_atspi2" = "yes"])
 
 # Accelerated compositing conditional
-AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "cairo" || test "$with_accelerated_compositing" = "opengl" || test "$with_accelerated_compositing" = "clutter"])
-AM_CONDITIONAL([USE_TEXTURE_MAPPER_CAIRO], [test "$with_accelerated_compositing" = "cairo"])
-AM_CONDITIONAL([USE_TEXTURE_MAPPER_GL], [test "$with_accelerated_compositing" = "opengl"])
-AM_CONDITIONAL([USE_CLUTTER], [test "$with_accelerated_compositing" = "clutter"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$enable_accelerated_compositing" = "yes"])
+AM_CONDITIONAL([USE_TEXTURE_MAPPER_CAIRO], [test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "none"])
+AM_CONDITIONAL([USE_TEXTURE_MAPPER_GL], [test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"])
+AM_CONDITIONAL([USE_CLUTTER], [test "$with_acceleration_backend" = "clutter"])
 
 # These are the same now, but they will soon be separate.
-AM_CONDITIONAL([USE_GLX], [test "$with_accelerated_compositing" = "opengl" || test "$enable_webgl" = "yes"])
-AM_CONDITIONAL([USE_OPENGL], [test "$with_accelerated_compositing" = "opengl" || test "$enable_webgl" = "yes"])
+AM_CONDITIONAL([USE_OPENGL], [test "$with_acceleration_backend" = "opengl"])
+AM_CONDITIONAL([USE_EGL], [test "$enable_egl" = "yes"])
+AM_CONDITIONAL([USE_GLES2], [test "$enable_gles2" = "yes"])
+AM_CONDITIONAL([USE_GLX], [test "$enable_glx" = "yes"])
 
-# IndexedDB implies LevelDB, but other features may one day require LevelDB.
-AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
-AM_CONDITIONAL([USE_LEVELDB],[test "$enable_indexed_database" = "yes"])
+# Farstream feature conditional
+AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
+AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
-AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
-AM_CONDITIONAL([ENABLE_LEGACY_WEBKIT_BLOB_BUILDER],[test "$enable_legacy_webkit_blob_builder" = "yes"])
-AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
-AM_CONDITIONAL([ENABLE_MICRODATA],[test "$enable_microdata" = "yes"])
-AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api" = "yes"])
-AM_CONDITIONAL([ENABLE_PROGRESS_TAG],[test "$enable_progress_tag" = "yes"])
-AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
 AM_CONDITIONAL([ENABLE_GAMEPAD],[test "$enable_gamepad" = "yes"])
-AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
-AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"])
-AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"])
-AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])
-AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
-AM_CONDITIONAL([ENABLE_DETAILS],[test "$enable_details" = "yes"])
-AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
-AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"])
-AM_CONDITIONAL([ENABLE_STYLE_SCOPED],[test "$enable_style_scoped" = "yes"])
-AM_CONDITIONAL([ENABLE_QUOTA],[test "$enable_quota" = "yes"])
-AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
-AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
-AM_CONDITIONAL([ENABLE_INPUT_TYPE_COLOR],[test "$enable_input_type_color" = "yes"])
-AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
-AM_CONDITIONAL([ENABLE_SCRIPTED_SPEECH],[test "$enable_scripted_speech" = "yes"])
 AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
-AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
-AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
-AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
 AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
-AM_CONDITIONAL([ENABLE_MEDIA_SOURCE],[test "$enable_media_source" = "yes"])
-AM_CONDITIONAL([ENABLE_MEDIA_STATISTICS],[test "$enable_media_statistics" = "yes"])
-AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"])
-AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"])
 AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
-AM_CONDITIONAL([ENABLE_LEGACY_NOTIFICATIONS],[test "$enable_legacy_notifications" = "yes"])
-AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
-AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
 AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
-AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
-AM_CONDITIONAL([ENABLE_SHADOW_DOM],[test "$enable_shadow_dom" = "yes"])
-AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
-AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
-AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
-AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
-AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
 AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"])
 AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"])
-AM_CONDITIONAL([ENABLE_ANIMATION_API],[test "$enable_animation_api" = "yes"])
-AM_CONDITIONAL([ENABLE_REQUEST_ANIMATION_FRAME],[test "$enable_request_animation_frame" = "yes"])
-AM_CONDITIONAL([ENABLE_TOUCH_ICON_LOADING],[test "$enable_touch_icon_loading" = "yes"])
-AM_CONDITIONAL([ENABLE_REGISTER_PROTOCOL_HANDLER],[test "$enable_register_protocol_handler" = "yes"])
-AM_CONDITIONAL([ENABLE_DEVICE_ORIENTATION],[test "$enable_device_orientation" = "yes"])
-AM_CONDITIONAL([ENABLE_MUTATION_OBSERVERS],[test "$enable_mutation_observers" = "yes"])
-AM_CONDITIONAL([ENABLE_IFRAME_SEAMLESS],[test "$enable_iframe_seamless" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_FILTERS],[test "$enable_css_filters" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_SHADERS],[test "$enable_css_shaders" = "yes"])
 
 # Gtk conditionals
 AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -1418,6 +1181,8 @@ GNUmakefile
 
 AC_CONFIG_FILES([
 Source/WebKit/gtk/webkit/webkitversion.h
+Source/WebKit/gtk/po/POTFILES
+DerivedSources/WebCore/UserAgentGtk.h:Source/WebCore/platform/gtk/UserAgentGtk.h.in
 ])
 
 AC_CONFIG_FILES([
@@ -1431,6 +1196,10 @@ Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaS
 
 if test "$enable_webkit2" = "yes"; then
     AC_CONFIG_FILES([
+    DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
+    ])
+
+    AC_CONFIG_FILES([
     Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
     ]
     ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
@@ -1449,65 +1218,26 @@ Build configuration:
  Enable GCC build optimization                            : $enable_optimizations
  Code coverage support                                    : $enable_coverage
  Unicode backend                                          : $with_unicode_backend
- Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
- Accelerated Compositing                                  : $with_accelerated_compositing
+ Accelerated rendering backend                            : $acceleration_backend_description
 
 Features:
- WebGL                                                    : $enable_webgl
- Blob support                                             : $enable_blob
- Legacy WebKitBlobBuilder support                         : $enable_legacy_webkit_blob_builder
- DOM mutation observer support                            : $enable_mutation_observers
- DeviceOrientation support                                : $enable_device_orientation
- Directory upload                                         : $enable_directory_upload
- Fast Mobile Scrolling                                    : $enable_fast_mobile_scrolling
- JIT compilation                                          : $enable_jit
- Filters support                                          : $enable_filters
- Geolocation support                                      : $enable_geolocation
- JavaScript debugger/profiler support                     : $enable_javascript_debugger
+=======
+ Accelerated Compositing                                  : $enable_accelerated_compositing
  Gamepad support                                          : $enable_gamepad
- MathML support                                           : $enable_mathml
- Media source                                             : $enable_media_source
- Media statistics                                         : $enable_media_statistics
- MHTML support                                            : $enable_mhtml
- HTML5 channel messaging support                          : $enable_channel_messaging
- HTML5 meter element support                              : $enable_meter_tag
- HTML5 microdata support                                  : $enable_microdata
- Page Visibility API support                              : $enable_page_visibility_api
- HTML5 progress element support                           : $enable_progress_tag
- HTML5 client-side session and persistent storage support : $enable_dom_storage
- SQL client-side database storage support                 : $enable_sql_database
- HTML5 datagrid support                                   : $enable_datagrid
- HTML5 data transfer items support                        : $enable_data_transfer_items
- HTML5 FileSystem API support                             : $enable_file_system
- Quota API support                                        : $enable_quota
- HTML5 sandboxed iframe support                           : $enable_sandbox
- HTML5 iframe seamless attribute support                  : $enable_iframe_seamless
+ Geolocation support                                      : $enable_geolocation
  HTML5 video element support                              : $enable_video
- HTML5 track element support                              : $enable_video_track
- Fullscreen API support                                   : $enable_fullscreen_api
+ JIT compilation                                          : $enable_jit
  Media stream support                                     : $enable_media_stream
- Icon database support                                    : $enable_icon_database
- Image resizer support                                    : $enable_image_resizer
- Link prefetch support                                    : $enable_link_prefetch
  Opcode stats                                             : $enable_opcode_stats
- Shadow DOM support                                       : $enable_shadow_dom
- SharedWorkers support                                    : $enable_shared_workers
- Color input support                                      : $enable_input_type_color
- Speech input support                                     : $enable_input_speech
- Scripted speech support                                  : $enable_scripted_speech
- SVG support                                              : $enable_svg
  SVG fonts support                                        : $enable_svg_fonts
+ SVG support                                              : $enable_svg
+ Spellcheck support                                       : $enable_spellcheck
  Web Audio support                                        : $enable_web_audio
- Web Sockets support                                      : $enable_web_sockets
- Web Timing support                                       : $enable_web_timing
- Web Workers support                                      : $enable_workers
+ WebGL                                                    : $enable_webgl
  XSLT support                                             : $enable_xslt
- Spellcheck support                                       : $enable_spellcheck
- Animation API                                            : $enable_animation_api
- RequestAnimationFrame support                            : $enable_request_animation_frame
- Touch Icon Loading support                               : $enable_touch_icon_loading
- Register Protocol Handler support                        : $enable_register_protocol_handler
+
+WebKit2 support:
  WebKit2 support                                          : $enable_webkit2
  WebKit2 plugin process                                   : $enable_plugin_process