X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=6282b16d71bab1811d654bc831baafc94f4b6392;hb=1333f417754e2428a92b5403d608daf9823ee928;hp=e41593eea7433fec68b31546d21b7a60aa99376c;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
index e41593e..6282b16
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,15 @@
 AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
-m4_define([webkit_minor_version], [7])
-m4_define([webkit_micro_version], [0])
+m4_define([webkit_minor_version], [9])
+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], [535])
-m4_define([webkit_user_agent_minor_version], [4])
+m4_define([webkit_user_agent_major_version], [536])
+m4_define([webkit_user_agent_minor_version], [10])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
@@ -35,10 +35,16 @@ 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=11:0:11
+LIBWEBKITGTK_VERSION=13:1:13
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
+LIBJAVASCRIPTCOREGTK_VERSION=13:1:13
+AC_SUBST([LIBJAVASCRIPTCOREGTK_VERSION])
+
+LIBWEBKIT2GTK_VERSION=13:1:13
+AC_SUBST([LIBWEBKIT2GTK_VERSION])
+
+AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
 
 # Use AM_SILENT_RULES if present
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -77,8 +83,60 @@ case "$host_os" in
        ;;
 esac
 
-# initialize webkit options
-WEBKIT_INIT
+# If CFLAGS and CXXFLAGS are unset, default to empty.
+# This is to tell automake not to include '-g' if C{XX,}FLAGS is not set
+# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler
+if test -z "$CXXFLAGS"; then
+   CXXFLAGS=""
+fi
+if test -z "$CFLAGS"; then
+   CFLAGS=""
+fi
+
+PKG_PROG_PKG_CONFIG
+
+AC_PATH_PROG(PERL, perl)
+if test -z "$PERL"; then
+   AC_MSG_ERROR([You need 'perl' to compile WebKit])
+fi
+
+AC_PATH_PROG(PYTHON, python)
+if test -z "$PYTHON"; then
+   AC_MSG_ERROR([You need 'python' 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])
+fi
+
+AC_PATH_PROG(MV, mv)
+if test -z "$MV"; then
+   AC_MSG_ERROR([You need 'mv' to compile WebKit])
+fi
+
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_PROG_INSTALL
+AC_SYS_LARGEFILE
+
+# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
+# doesn't exist)
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
+AC_LANG_POP([C++])
+
+# C/C++ Language Features
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+
+# C/C++ Headers
+AC_HEADER_STDC
+AC_HEADER_STDBOOL
+
+# Linker
 AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
@@ -99,18 +157,44 @@ if test -z "$GPERF"; then
    AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
 fi
 
+# check for -fvisibility=hidden compiler support (GCC >= 4)
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
+      [ AC_MSG_RESULT([yes])
+        SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ],
+        AC_MSG_RESULT([no]))
+CFLAGS="$saved_CFLAGS"
+AC_SUBST(SYMBOL_VISIBILITY)
+AC_SUBST(SYMBOL_VISIBILITY_INLINES)
+
 # Disable C++0x compat warnings for GCC >= 4.6.0 until we build
 # cleanly with that.
-if test "$CXX" = "g++"; then
-   CXX_VERSION=`$CXX -dumpversion`
-   AX_COMPARE_VERSION([$CXX_VERSION],[ge],[4.6.0],CXXFLAGS="$CXXFLAGS -Wno-c++0x-compat")
+AC_LANG_PUSH(C++)
+TMPCXXFLAGS=$CXXFLAGS
+CXXFLAGS="-Wall -Werror"
+AC_MSG_CHECKING([if we have to disable C++0x compat warnings for GCC >= 4.6.0])
+AC_TRY_COMPILE([
+namespace std {
+    class nullptr_t { };
+}
+extern std::nullptr_t nullptr;
+], [return 0;],
+disable_cxx0x_compat=no,
+disable_cxx0x_compat=yes)
+AC_MSG_RESULT($disable_cxx0x_compat)
+if test "$disable_cxx0x_compat" = yes; then
+  CXXFLAGS="$TMPCXXFLAGS -Wno-c++0x-compat"
+else
+  CXXFLAGS="$TMPCXXFLAGS"
 fi
+AC_LANG_POP(C++)
 
 # pthread (not needed on Windows)
 if test "$os_win32" = "no"; then
 AC_CHECK_HEADERS([pthread.h],
-                 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists])
-                 AC_DEFINE([WTF_USE_PTHREADS],[1],[Use pthreads]),
+                 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
                  AC_MSG_ERROR([pthread support is required to build WebKit]))
 AC_CHECK_LIB(pthread, pthread_rwlock_init,
                  AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
@@ -149,8 +233,8 @@ for l in libpng libpng14 libpng12; do
     PNG_LIBS=`$PKG_CONFIG --libs $l`
     png_ok=yes
     break
-else
-  AC_MSG_RESULT(no)
+  else
+    AC_MSG_RESULT(no)
     png_ok=no
   fi
 done
@@ -173,7 +257,7 @@ if test "$png_ok" != yes; then
       AC_MSG_ERROR([PNG library (libpng) not found])
     fi
   else
-   AC_MSG_ERROR([PNG library (libpng) not found])
+    AC_MSG_ERROR([PNG library (libpng) not found])
   fi
 fi
 AC_SUBST([PNG_LIBS])
@@ -202,7 +286,7 @@ AC_MSG_RESULT([$with_gtk])
 
 GTK2_REQUIRED_VERSION=2.10
 GAIL2_REQUIRED_VERSION=1.8
-GTK3_REQUIRED_VERSION=3.0
+GTK3_REQUIRED_VERSION=3.4.0
 GAIL3_REQUIRED_VERSION=3.0
 
 case "$with_gtk" in
@@ -247,90 +331,112 @@ esac
 
 AC_MSG_RESULT([$with_target])
 
-AC_MSG_CHECKING([for Hildon UI extensions])
-AC_ARG_WITH(hildon,
-            AC_HELP_STRING([--with-hildon],
-                           [Use Hildon UI extensions [default=no]]),
-            [],[with_hildon="no"])
-AC_MSG_RESULT([$with_hildon])
-
-if test "$with_hildon" = "yes"; then
-    HILDON_CPPFLAGS="-DMAEMO_CHANGES"
-    PKG_CHECK_MODULES([HILDON], [hildon-1])
-    AC_SUBST([HILDON_CPPFLAGS])
-    AC_SUBST([HILDON_CFLAGS])
-    AC_SUBST([HILDON_LIBS])
-fi
-
-# determine the efl target
-AC_MSG_CHECKING([the efl target to build])
-AC_ARG_WITH(efl_target,
-            AC_HELP_STRING([--with-efl-target=@<:@arm/i386@:>@],
-                           [Select Network backend [default=arm]]),
-            [],[with_efl_target="arm"])
-case "$with_efl_target" in
-      arm|i386) ;;
-      *) AC_MSG_ERROR([Invalid efl target: must be arm, i386.]) ;;
-esac
-AC_MSG_RESULT([$with_efl_target])
-
-# check whether to enable SLP multimedia player
-AC_MSG_CHECKING([whether to enable multimedia player support])
-AC_ARG_ENABLE(mm-player,
-              AC_HELP_STRING([--enable-mm-player],
-                             [enable multimedia player support [default=yes]]),
-              [],[enable_mm_player="yes"])
-AC_MSG_RESULT([$enable_mm_player])
-
-# determine the http backend
-AC_MSG_CHECKING([the HTTP backend to use])
-AC_ARG_WITH(http_backend,
-            AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@],
-                           [Select HTTP backend [default=soup]]),
-            [],[with_http_backend="soup"])
-case "$with_http_backend" in
-      curl|soup) ;;
-      *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;;
+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_MSG_RESULT([$with_http_backend])
 
-# check whether to enable enchant support
-AC_MSG_CHECKING([whether to enable enchant support])
-AC_ARG_ENABLE(enchant,
-	      AC_HELP_STRING([--enable-enchant],
-	                    [enable support for enchant [default=no]]),					    [],[enable_enchant="no"])
-AC_MSG_RESULT([$enable_enchant])
-
-if test "$enable_enchant" = "yes"; then
-PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
-AC_SUBST(ENCHANT_CFLAGS)
-AC_SUBST(ENCHANT_LIBS)
+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
-LIBSOUP_REQUIRED_VERSION=2.33.6
 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
 LIBXML_REQUIRED_VERSION=2.6
-
-# minimum GTK+ base dependencies
-PANGO_REQUIRED_VERSION=1.12
+PANGO_REQUIRED_VERSION=1.21.0
 
 # optional modules
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
-GSTREAMER_REQUIRED_VERSION=0.10
-GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
 ENCHANT_REQUIRED_VERSION=0.22
+CLUTTER_REQUIRED_VERSION=1.8.2
+CLUTTER_GTK_REQUIRED_VERSION=1.0.2
+ATSPI2_REQUIRED_VERSION=2.2.1
+
+# Check for glib and required utilities
+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
+GLIB_GSETTINGS
+
+# Check and identify which unicode backend to use
+AC_MSG_CHECKING([which Unicode backend to use])
+AC_ARG_WITH(unicode_backend,
+            AC_HELP_STRING([--with-unicode-backend=@<:@icu/glib@:>@],
+                           [Select Unicode backend (WARNING: the glib-based backend is slow, and incomplete) [default=icu]]),
+            [],[with_unicode_backend="icu"])
+
+case "$with_unicode_backend" in
+     icu|glib) ;;
+     *) AC_MSG_ERROR([Invalid Unicode backend: must be icu or glib.]) ;;
+esac
 
-# Available modules
-#
-# glib - glib and includes gthread
-# unicode - check and identify which unicode backend to use
-#
-# todo: webcore gtk
-WEBKIT_CHECK_DEPENDENCIES([glib unicode])
+AC_MSG_RESULT([$with_unicode_backend])
+
+if test "$with_unicode_backend" = "icu"; then
+    # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up)
+    case "$host" in
+        *-*-darwin*)
+            UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
+            UNICODE_LIBS="-licucore"
+            ;;
+        *-*-mingw*)
+            UNICODE_CFLAGS=""
+            UNICODE_LIBS="-licui18n -licuuc"
+            ;;
+        *)
+            AC_PATH_PROG(icu_config, icu-config, no)
+            if test "$icu_config" = "no"; then
+                AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
+            fi
+
+            # We don't use --cflags as this gives us a lot of things that we don't
+            # necessarily want, like debugging and optimization flags
+            # See man (1) icu-config for more info.
+            UNICODE_CFLAGS=`$icu_config --cppflags`
+            UNICODE_LIBS=`$icu_config --ldflags-libsonly`
+            ;;
+    esac
+fi
+
+if test "$with_unicode_backend" = "glib"; then
+    PKG_CHECK_MODULES([UNICODE], [glib-2.0 pango >= $PANGO_REQUIRED_VERSION])
+fi
+
+AC_SUBST([UNICODE_CFLAGS])
+AC_SUBST([UNICODE_LIBS])
+
+PKG_CHECK_MODULES([ZLIB], [zlib])
+AC_SUBST([ZLIB_CFLAGS])
+AC_SUBST([ZLIB_LIBS])
 
 GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
 AC_SUBST(GETTEXT_PACKAGE)
@@ -392,75 +498,12 @@ else
       AC_SUBST([XT_LIBS])
       AC_DEFINE([WTF_PLATFORM_X11],[1],[Define if target is X11])
    fi
-
-   if test "$with_port" = "efl"; then
-      AC_DEFINE([WTF_PLATFORM_CAIRO],[1],[Define if platform is Cairo])
-   fi
 fi
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
-if test "$with_port" = "efl"; then
-# minimum EFL base dependencies
-EINA_REQUIRED_VERSION=0.0.1
-EVAS_REQUIRED_VERSION=0.1
-ECORE_REQUIRED_VERSION=0.9
-ECORE_EVAS_REQUIRED_VERSION=0.9
-ECORE_X_REQUIRED_VERSION=0.9
-EDJE_REQUIRED_VERSION=0.9.9.050
-CAIRO_REQUIRED_VERSION=1.6
-FONTCONFIG_REQUIRED_VERSION=2.4
-FREETYPE2_REQUIRED_VERSION=9.0
-GSTREAMER_REQUIRED_VERSION=0.10
-
-LIBSOUP_REQUIRED_VERSION=2.28.2
-LIBXSLT_REQUIRED_VERSION=1.1.7
-SQLITE_REQUIRED_VERSION=3.0
-
-WEBKIT_CHECK_DEPENDENCIES_MODULES="unicode"
-
-want_ecore_x="auto"
-have_ecore_x="no"
-AC_ARG_ENABLE(ecore_x,
-  AC_HELP_STRING(
-    [--disable-ecore_x],
-    [disable ecore_x specific support. [[default=enabled]]]
-  ),
-  [ want_ecore_x=$enableval ]
-)
-
-if test "x$want_ecore_x" = "xyes" -o "x$want_ecore_x" = "xauto" ; then
-  # Check if really available
-  PKG_CHECK_MODULES(ECORE_X, [ecore-x >= $ECORE_X_REQUIRED_VERSION],
-    [
-      have_ecore_x="yes"
-      AC_DEFINE(HAVE_ECORE_X, 1, [have ecore_x specific support])
-      AC_SUBST([ECORE_X_CFLAGS])
-      AC_SUBST([ECORE_X_LIBS])
-    ],
-    [
-      if test "x$want_ecore_x" = "xyes" -a "x$use_strict" = "xyes" ; then
-        AC_MSG_ERROR([Ecore_X not found (strict dependencies checking)])
-      fi
-    ])
-fi
-
-PKG_CHECK_MODULES([EFLDEPS],
-                  [eina >= $EINA_REQUIRED_VERSION
-                  evas >= $EVAS_REQUIRED_VERSION
-                  ecore >= $ECORE_REQUIRED_VERSION
-                  ecore-file >= $ECORE_REQUIRED_VERSION
-                  ecore-evas >= $ECORE_EVAS_REQUIRED_VERSION
-                  edje >= $EDJE_REQUIRED_VERSION
-                  cairo >= $CAIRO_REQUIRED_VERSION
-                  ])
-
-AC_SUBST([EFLDEPS_CFLAGS])
-AC_SUBST([EFLDEPS_LIBS])
-fi
-
 # check whether to build with debugging enabled
 AC_MSG_CHECKING([whether to do a debug build])
 AC_ARG_ENABLE(debug,
@@ -479,29 +522,41 @@ 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 3D rendering support
-AC_MSG_CHECKING([whether to enable support for 3D Rendering])
-AC_ARG_ENABLE(3d_rendering,
-              AC_HELP_STRING([--enable-3d-rendering],
-                             [enable support for 3D Rendering (experimental) [default=no]]),
-              [],[enable_3d_rendering="no"])
-AC_MSG_RESULT([$enable_3d_rendering])
-
 # 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 (experimental) [default=no]]),
-              [], [enable_webgl="no"])
+              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])
 
-if test "$enable_webgl" = "yes"; then
+# 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"
 fi
 AC_SUBST([OPENGL_LIBS])
 
+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])
+
+   AC_SUBST(CLUTTER_CFLAGS)
+   AC_SUBST(CLUTTER_LIBS)
+   AC_SUBST(CLUTTER_GTK_CFLAGS)
+   AC_SUBST(CLUTTER_GTK_LIBS)
+fi
+
 # check whether to enable channel messaging support
 AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
 AC_ARG_ENABLE(channel_messaging,
@@ -510,6 +565,14 @@ AC_ARG_ENABLE(channel_messaging,
               [],[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,
@@ -566,14 +629,6 @@ AC_ARG_ENABLE(gamepad,
               [],[enable_gamepad="no"])
 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,
@@ -590,29 +645,21 @@ AC_ARG_ENABLE(mutation_observers,
               [],[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 [default=no]]),
+                             [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_color,
-              AC_HELP_STRING([--enable-input-color],
+AC_ARG_ENABLE(input_type_color,
+              AC_HELP_STRING([--enable-input-type-color],
                              [enable the color input [default=no]]),
-              [],[enable_input_color="no"])
-AC_MSG_RESULT([$enable_input_color])
+              [],[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])
@@ -622,6 +669,14 @@ AC_ARG_ENABLE(input_speech,
               [],[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,
@@ -638,14 +693,6 @@ AC_ARG_ENABLE(icon_database,
               [],[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,
@@ -654,13 +701,13 @@ AC_ARG_ENABLE(datalist,
               [],[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_iframe_seamless])
 
 # check whether to enable HTML5 audio/video support
 AC_MSG_CHECKING([whether to enable HTML5 video support])
@@ -679,8 +726,8 @@ fi
 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=yes]]),
-              [],[enable_video_track="yes"])
+                             [enable HTML5 video track support [default=no]]),
+              [],[enable_video_track="no"])
 AC_MSG_RESULT([$enable_video_track])
 
 # check whether to enable media source support
@@ -715,14 +762,6 @@ AC_ARG_ENABLE(media_stream,
               [],[enable_media_stream="no"])
 AC_MSG_RESULT([$enable_media_stream])
 
-# check whether to enable XPath support
-AC_MSG_CHECKING([whether to enable XPath support])
-AC_ARG_ENABLE(xpath,
-              AC_HELP_STRING([--enable-xpath],
-                             [enable support for XPath [default=yes]]),
-              [],[enable_xpath="yes"])
-AC_MSG_RESULT([$enable_xpath])
-
 # check whether to enable XSLT support
 AC_MSG_CHECKING([whether to enable XSLT support])
 AC_ARG_ENABLE(xslt,
@@ -735,26 +774,26 @@ AC_MSG_RESULT([$enable_xslt])
 AC_MSG_CHECKING([whether to enable geolocation support])
 AC_ARG_ENABLE(geolocation,
               AC_HELP_STRING([--enable-geolocation],
-                             [enable support for geolocation [default=no]]),
-              [],[enable_geolocation="no"])
+                             [enable support for geolocation [default=yes]]),
+              [],[enable_geolocation="yes"])
 AC_MSG_RESULT([$enable_geolocation])
 
-# check whether to enable client-based geolocation support
-AC_MSG_CHECKING([whether to enable client-based geolocation support])
-AC_ARG_ENABLE(client_based_geolocation,
-              AC_HELP_STRING([--enable-client-based-geolocation],
-                             [enable support for client-based geolocation [default=no]]),
-              [],[enable_client_based_geolocation="no"])
-AC_MSG_RESULT([$enable_client_based_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=no]]),
-              [],[enable_mathml="no"])
+                             [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,
@@ -763,6 +802,14 @@ 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,
@@ -795,6 +842,14 @@ AC_ARG_ENABLE(file_system,
               [], [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,
@@ -865,6 +920,14 @@ AC_ARG_ENABLE(blob,
               [],[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,
@@ -881,6 +944,14 @@ AC_ARG_ENABLE(coverage,
               [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 
+# check whether to enable CSS flaxbox support
+AC_MSG_CHECKING([whether to enable CSS3 flexbox support])
+AC_ARG_ENABLE(css3_flexbox,
+              AC_HELP_STRING([--enable-css3-flexbox],
+                             [enable CSS3 flexbox support [default=no]]),
+              [],[enable_css3_flexbox="no"])
+AC_MSG_RESULT([$enable_css3_flexbox])
+
 # check whether to enable FastMalloc
 AC_MSG_CHECKING([whether to enable optimized memory allocator])
 AC_ARG_ENABLE(fast_malloc,
@@ -905,67 +976,16 @@ AC_ARG_ENABLE(debug_features,
               [],[if test "$enable_debug" = "yes"; then enable_debug_features="yes"; else enable_debug_features="no"; fi])
 AC_MSG_RESULT([$enable_debug_features])
 
-# Determine JavaScript engine to use.
-AC_MSG_CHECKING([Javascript engine])
-AC_ARG_WITH(jsengine,
-            AC_HELP_STRING([--with-jsengine=@<:@jsc@:>@],
-                           [Select Javascript engine [default=jsc]]),
-            [],[with_jsengine="jsc"])
-
-case "$with_jsengine" in
-     jsc) ;;
-     *) AC_MSG_ERROR([Invalid JS engine: Must be jsc]) ;;
+AC_MSG_CHECKING([whether to enable JIT compilation])
+AC_ARG_ENABLE(jit,
+              AS_HELP_STRING([--enable-jit],
+                             [Enable JIT compilation (default: autodetect)]))
+case "$enable_jit" in
+  yes) JSC_CPPFLAGS="-DENABLE_JIT=1" ;;
+  no) JSC_CPPFLAGS="-DENABLE_JIT=0" ;;
+  *) enable_jit="autodetect" ;;
 esac
-AC_MSG_RESULT([$with_jsengine])
-
-if test "$with_jsengine" = "jsc"; then
-    AC_MSG_CHECKING([whether to enable JIT compilation])
-    AC_ARG_ENABLE([jit],
-                  AC_HELP_STRING([--enable-jit],
-                                 [Enable JIT compilation default=yes]),
-                  [],[enable_jit="yes"])
-    if test "$enable_jit" = "yes"; then
-        case "$host_cpu" in
-            arm*)
-                AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
-                AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
-                AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
-            ;;
-            i*86|x86_64)
-                AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
-                AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
-                AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
-                AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
-                AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
-                AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
-                case "$host_cpu" in
-                    i*86)
-                        AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
-                    ;;
-                    x86_64)
-                        AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
-                        AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
-                    ;;
-                esac
-            ;;
-            sh4)
-                AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
-                AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
-                AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
-                AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
-            ;;
-            *)
-                enable_jit="no (CPU '$host_cpu' not supported)"
-            ;;
-        esac
-    else
-            AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
-    fi
-else
-    AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
-    enable_jit="no"
-fi
-
+AC_SUBST(JSC_CPPFLAGS)
 AC_MSG_RESULT([$enable_jit])
 
 # Opcode stats
@@ -981,20 +1001,7 @@ if test "$enable_opcode_stats" = "yes"; then
   fi
   AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
 fi
-  
-if test "$with_http_backend" = "curl"; then
-PKG_CHECK_MODULES(LIBCURL, libcurl)
-AC_SUBST([LIBCURL_CFLAGS])
-AC_SUBST([LIBCURL_LIBS])
-fi
 
-if test "$with_http_backend" = "soup"; then
-PKG_CHECK_MODULES([LIBSOUP],
-                     [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
-AC_SUBST([LIBSOUP_CFLAGS])
-AC_SUBST([LIBSOUP_LIBS])
-fi
-   
 # Link prefetch
 AC_MSG_CHECKING([whether to enable link prefetch support])
 AC_ARG_ENABLE([link-prefetch],
@@ -1025,8 +1032,8 @@ AC_MSG_RESULT([$enable_animation_api])
 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=no]]),
-              [],[enable_request_animation_frame="no"])
+                             [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 
@@ -1053,6 +1060,30 @@ AC_ARG_ENABLE(device_orientation,
               [],[enable_device_orientation="no"])
 AC_MSG_RESULT([$enable_device_orientation])
 
+# check whether to enable Font Boosting support
+AC_MSG_CHECKING([whether to enable Font Boosting])
+AC_ARG_ENABLE(font_boosting,
+              AC_HELP_STRING([--enable-font-boosting],
+                             [enable support for Font Boosting (incomplete) [default=no]]),
+              [],[enable_font_boosting="no"])
+AC_MSG_RESULT([$enable_font_boosting])
+
+# check whether to enable CSS Exclusions support
+AC_MSG_CHECKING([whether to enable CSS Exclusions])
+AC_ARG_ENABLE(css_exclusions,
+              AC_HELP_STRING([--enable-css-exclusions],
+                             [enable support for CSS Exclusions [default=yes]]),
+              [],[enable_css_exclusions="yes"])
+AC_MSG_RESULT([$enable_css_exclusions])
+
+# check whether to enable CSS Regions support
+AC_MSG_CHECKING([whether to enable CSS Regions])
+AC_ARG_ENABLE(css_regions,
+              AC_HELP_STRING([--enable-css-regions],
+                             [enable support for CSS Regions [default=yes]]),
+              [],[enable_css_regions="yes"])
+AC_MSG_RESULT([$enable_css_regions])
+
 G_IR_SCANNER=
 G_IR_COMPILER=
 G_IR_GENERATE=
@@ -1073,46 +1104,6 @@ AC_SUBST([G_IR_SCANNER])
 AC_SUBST([G_IR_COMPILER])
 AC_SUBST([G_IR_GENERATE])
 
-if test "$with_port" = "efl"; then
-# check whether to build with glib support
-AC_MSG_CHECKING([whether to enable Glib support (adds main loop integration when using EFL)])
-AC_ARG_ENABLE(glib_support,
-              AC_HELP_STRING([--enable-glib-support],
-                             [enable Glib support [default=yes]]),
-              [],[enable_glib_support="yes"])
-AC_MSG_RESULT([$enable_glib_support])
-
-# check for SVG features, enabling SVG if necessary
-if test "$enable_glib_support" = "no" && \
-   test "$enable_video" = "yes"; then
-       AC_MSG_ERROR([Video support requires glib-support. See --enable-glib-support configure option.])
-fi
-
-AC_MSG_CHECKING([whether to enable GTK plugins support (requires glib support)])
-AC_ARG_ENABLE(gtk_plugins_support,
-              AC_HELP_STRING([--enable-gtk-plugins-support],
-                             [enable gtk plugins support [default=yes]]),
-              [],[enable_gtk_plugins_support="auto"])
-AC_MSG_RESULT([$enable_gtk_plugins_support])
-
-if test "$enable_gtk_plugins_support" = "yes" -a "$enable_glib_support" = "no"; then
-   AC_MSG_ERROR([required gtk plugins support, but no glib support.])
-fi
-
-if test "$enable_gtk_plugins_support" != "no"; then
-   PKG_CHECK_MODULES(GTK, [gtk+-2.0], [has_gtk="yes"], [has_gtk="no"])
-   AC_SUBST([GTK_CFLAGS])
-   AC_SUBST([GTK_LIBS])
-fi
-
-if test "$enable_gtk_plugins_support" = "yes" -a "$has_gtk" = "no"; then
-   AC_MSG_ERROR([required gtk plugins support but no gtk+-2.0 pkg-config found.])
-elif test "$enable_gtk_plugins_support" = "auto" -a "$has_gtk" = "yes"; then
-   enable_gtk_plugins_support="yes"
-fi
-
-fi
-
 # determine the font backend
 AC_MSG_CHECKING([the font backend to use])
 AC_ARG_WITH(font_backend,
@@ -1150,6 +1141,10 @@ else
    CFLAGS="$CFLAGS -O0"
 fi
 
+PKG_CHECK_MODULES([LIBSOUP],
+                  [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+AC_SUBST([LIBSOUP_CFLAGS])
+AC_SUBST([LIBSOUP_LIBS])
 
 # check if FreeType/FontConfig are available
 if test "$with_font_backend" = "freetype"; then
@@ -1186,17 +1181,6 @@ if (test "$sqlite3_found" = "no"); then
    AC_MSG_ERROR([SQLite3 is required for the Database related features])
 fi
 
-# check if glib is available
-if test "$enable_glib_support" = "yes"; then
-   GLIB_REQUIRED_VERSION=2.0
-   GTHREAD_REQUIRED_VERSION=2.0
-   PKG_CHECK_MODULES([GLIB],
-                     [glib-2.0 >= $GLIB_REQUIRED_VERSION
-                     gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
-   AC_SUBST([GLIB_CFLAGS])
-   AC_SUBST([GLIB_LIBS])
-fi
-
 # check if libxslt is available
 if test "$enable_xslt" = "yes"; then
    PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
@@ -1206,8 +1190,7 @@ fi
 
 # check if geoclue is available
 if test "$enable_geolocation" = "yes"; then
-    PKG_CHECK_MODULES([GEOCLUE], [geoclue location])
-    AC_DEFINE([ENABLE_GEOLOCATION], [1], [Define to enable geolocation])
+    PKG_CHECK_MODULES([GEOCLUE], [geoclue])
     AC_SUBST([GEOCLUE_CFLAGS])
     AC_SUBST([GEOCLUE_LIBS])
 fi
@@ -1221,21 +1204,45 @@ if test "$os_win32" = "no"; then
 fi
 
 # check if gstreamer is available
-if test "$enable_video" = "yes"; then
-   PKG_CHECK_MODULES([GSTREAMER],
-                     [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
-                     gstreamer-app-0.10
-                     gstreamer-base-0.10
-                     gstreamer-interfaces-0.10
-                     gstreamer-pbutils-0.10
-                     gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
-                     gstreamer-video-0.10],
-                     [have_gstreamer=yes])
-
+if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
+    gstreamer_modules="gstreamer-$GST_API_VERSION >= $GSTREAMER_REQUIRED_VERSION
+                       gstreamer-app-$GST_API_VERSION
+                       gstreamer-audio-$GST_API_VERSION
+                       gstreamer-fft-$GST_API_VERSION
+                       gstreamer-base-$GST_API_VERSION
+                       gstreamer-pbutils-$GST_API_VERSION
+                       gstreamer-plugins-base-$GST_API_VERSION >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
+                       gstreamer-video-$GST_API_VERSION";
+   if test "$GST_API_VERSION" != "1.0"; then
+       gstreamer_modules="$gstreamer_modules gstreamer-interfaces-$GST_API_VERSION";
+   fi
+   PKG_CHECK_MODULES([GSTREAMER], [$gstreamer_modules], [have_gstreamer=yes])
    AC_SUBST([GSTREAMER_CFLAGS])
    AC_SUBST([GSTREAMER_LIBS])
 fi
 
+
+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])
+
+   AC_SUBST(CLUTTER_CFLAGS)
+   AC_SUBST(CLUTTER_LIBS)
+   AC_SUBST(CLUTTER_GTK_CFLAGS)
+   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])
+
+   AC_SUBST([ATSPI2_CFLAGS])
+   AC_SUBST([ATSPI2_LIBS])
+fi
+
 # check for code coverage support
 if test "$enable_coverage" = "yes"; then
    COVERAGE_CFLAGS="-MD"
@@ -1250,15 +1257,27 @@ if test "$enable_video" = "yes"; then
 fi
 
 # WebKit2
+# If you change the default here, please also make sure the assumptions made
+# in Tools/Scripts/webkitdirs.pm:buildAutotoolsProject still make sense.
 AC_MSG_CHECKING([whether to build Webkit2])
 AC_ARG_ENABLE(webkit2,
-    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]),
-    [], [enable_webkit2="no"])
+    AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=yes]]),
+    [], [enable_webkit2="yes"])
 AC_MSG_RESULT([$enable_webkit2])
 if test "$enable_webkit2" = "yes"; then
    if test "$GTK_API_VERSION" = "2.0"; then
       AC_MSG_ERROR([WebKit2 requires GTK+ 3.x, use --with-gtk=3.0])
    fi
+
+   # Check Unix printing
+   PKG_CHECK_MODULES(GTK_UNIX_PRINTING, gtk+-unix-print-3.0,
+                     [have_gtk_unix_printing=yes],
+                     [have_gtk_unix_printing=no])
+   AC_SUBST(GTK_UNIX_PRINTING_CFLAGS)
+   AC_SUBST(GTK_UNIX_PRINTING_LIBS)
+   if test "$have_gtk_unix_printing" = "yes"; then
+       AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
+   fi
 fi
 
 # Plugin Process
@@ -1294,11 +1313,6 @@ AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"])
 AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
 AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
 AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
-AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "arm"])
-AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "i386"])
-
-# JS engine conditionals
-AM_CONDITIONAL([USE_JSC], [test "$with_jsengine" = "jsc"])
 
 # Unicode backend conditionals
 AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
@@ -1310,40 +1324,53 @@ 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"])
+
+# ATSPI2 conditional
+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"])
+
+# 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"])
+
+# 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"])
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
-AM_CONDITIONAL([ENABLE_3D_RENDERING],[test "$enable_3d_rendering" = "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_TIZEN_SUPPORT_BLUE_RUNNER],[test "$enable_slp_support_blue_runner" = "yes"])
-AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "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_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
-AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "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_XPATH],[test "$enable_xpath" = "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_CLIENT_BASED_GEOLOCATION], [test "$enable_client_based_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"])
@@ -1352,13 +1379,16 @@ 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_CSS3_FLEXBOX],[test "$enable_css3_flexbox" = "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"])
@@ -1375,6 +1405,10 @@ AM_CONDITIONAL([ENABLE_TOUCH_ICON_LOADING],[test "$enable_touch_icon_loading" =
 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_FONT_BOOSTING],[test "$enable_font_boosting" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_EXCLUSIONS],[test "$enable_css_exclusions" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_REGIONS],[test "$enable_css_regions" = "yes"])
 
 # Gtk conditionals
 AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -1386,16 +1420,11 @@ GNUmakefile
 
 AC_CONFIG_FILES([
 Source/WebKit/gtk/webkit/webkitversion.h
-Source/WebKit/gtk/docs/GNUmakefile
-Source/WebKit/gtk/docs/version.xml
-Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile
-Source/WebKit2/UIProcess/API/gtk/docs/version.xml
 ])
 
 AC_CONFIG_FILES([
 Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
 Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
-Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
 Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
 ]
 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
@@ -1424,54 +1453,57 @@ Build configuration:
  Unicode backend                                          : $with_unicode_backend
  Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
- JavaScript Engine                                        : $with_jsengine
+ Accelerated Compositing                                  : $with_accelerated_compositing
+
 Features:
- 3D Rendering                                             : $enable_3d_rendering
  WebGL                                                    : $enable_webgl
  Blob support                                             : $enable_blob
+ CSS3 Flexbox support                                     : $enable_css3_flexbox
+ Legacy WebKitBlobBuilder support                         : $enable_legacy_webkit_blob_builder
+ CSS Exclusions support                                   : $enable_css_exclusions
+ CSS Regions support                                      : $enable_css_regions
  DOM mutation observer support                            : $enable_mutation_observers
  DeviceOrientation support                                : $enable_device_orientation
  Directory upload                                         : $enable_directory_upload
  Fast Mobile Scrolling                                    : $enable_fast_mobile_scrolling
+ Font Boosting support                                    : $enable_font_boosting
  JIT compilation                                          : $enable_jit
  Filters support                                          : $enable_filters
  Geolocation support                                      : $enable_geolocation
- Client-based geolocation support                         : $enable_client_based_geolocation
  JavaScript debugger/profiler support                     : $enable_javascript_debugger
  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
  HTML5 video element support                              : $enable_video
  HTML5 track element support                              : $enable_video_track
  Fullscreen API support                                   : $enable_fullscreen_api
  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_color
+ 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
  Web Audio support                                        : $enable_web_audio
  Web Sockets support                                      : $enable_web_sockets
  Web Timing support                                       : $enable_web_timing
  Web Workers support                                      : $enable_workers
- XPATH support                                            : $enable_xpath
  XSLT support                                             : $enable_xslt
  Spellcheck support                                       : $enable_spellcheck
  Animation API                                            : $enable_animation_api
@@ -1484,8 +1516,9 @@ Features:
 GTK+ configuration:
  GTK+ version                                             : $with_gtk
  GDK target                                               : $with_target
- Hildon UI extensions                                     : $with_hildon
+ GStreamer version                                        : $with_gstreamer
  Introspection support                                    : $enable_introspection
+ Generate documentation                                   : $enable_gtk_doc
 "
 if test "$with_unicode_backend" = "glib"; then
    echo "     >> WARNING: the glib-based unicode backend is slow and incomplete <<"