summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-11 10:24:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 14:00:46 (GMT)
commitb36f998fc7b185e67d094fe59239f7a77167a9c4 (patch)
tree874b9d8fc1547d86871792d1a42b1fcac02d4467 /meta/recipes-sato
parent01552639c901223843b19410cb440c2da7726997 (diff)
downloadpoky-b36f998fc7b185e67d094fe59239f7a77167a9c4.tar.gz
webkit-gtk: update SRCREV
The layout of the repository has changed, so we need to account for that: * fixed license checksums * fixed SRC_URI * fixed SRCREV_FORMAT PCRE is gone, so no need for the dftables hack anymore But most importantly, this fixes the crash issues when using javascript (e.g. github.com) Tested on: * usrp-e1xx/angstrom-2011.07 (From OE-Core rev: 7df4f5f3d64f1f60814cea60d83270be7bfa4f2c) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/files/GNUmakefile.am107
-rw-r--r--meta/recipes-sato/webkit/files/Makefile2
-rw-r--r--meta/recipes-sato/webkit/files/Makefile.shared2
-rwxr-xr-xmeta/recipes-sato/webkit/files/autogen.sh51
-rw-r--r--meta/recipes-sato/webkit/files/configure.ac451
-rwxr-xr-xmeta/recipes-sato/webkit/files/update-webkit.sh8
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb53
7 files changed, 454 insertions, 220 deletions
diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 8884fcb..fb10790 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -34,10 +34,12 @@ GENSOURCES := $(top_builddir)/DerivedSources
34GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore 34GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
35GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore 35GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
36GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit 36GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
37GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
37GENPROGRAMS := $(top_builddir)/Programs 38GENPROGRAMS := $(top_builddir)/Programs
38GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector 39GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
39WebCore := $(srcdir)/WebCore 40WebCore := $(srcdir)/Source/WebCore
40WebKit := $(srcdir)/WebKit/gtk 41WebKit := $(srcdir)/Source/WebKit/gtk
42WebKit2 := $(srcdir)/Source/WebKit2
41 43
42# Libraries and support components 44# Libraries and support components
43bin_PROGRAMS := 45bin_PROGRAMS :=
@@ -51,6 +53,7 @@ POFILES :=
51MOFILES := 53MOFILES :=
52javascriptcore_h_api := 54javascriptcore_h_api :=
53javascriptcore_cppflags:= 55javascriptcore_cppflags:=
56javascriptcore_cflags :=
54javascriptcore_sources := 57javascriptcore_sources :=
55javascriptcore_built_sources := 58javascriptcore_built_sources :=
56javascriptcore_built_nosources := 59javascriptcore_built_nosources :=
@@ -69,6 +72,8 @@ webkitgtk_cppflags :=
69webkitgtk_gdom_built_sources := 72webkitgtk_gdom_built_sources :=
70webkitgtk_built_sources := 73webkitgtk_built_sources :=
71webkitgtk_built_nosources := 74webkitgtk_built_nosources :=
75webkit2_built_sources :=
76libwebcoreinternals_built_sources :=
72global_cppflags := 77global_cppflags :=
73global_cflags := 78global_cflags :=
74global_cxxflags := 79global_cxxflags :=
@@ -83,6 +88,21 @@ CLEANFILES :=
83DISTCLEANFILES := 88DISTCLEANFILES :=
84MAINTAINERCLEANFILES := 89MAINTAINERCLEANFILES :=
85 90
91# We do not care at all about this implicit built-in make rules,
92# disable them to save some build time
93%: %.c
94%: %.cpp
95%: %.o
96(%): %
97%.out: %
98%.c: %.w %.ch
99%.tex: %.w %.ch
100%:: %,v
101%:: RCS/%,v
102%:: RCS/%
103%:: s.%
104%:: SCCS/s.%
105
86global_cppflags += \ 106global_cppflags += \
87 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ 107 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
88 -Wformat -Wformat-security -Wno-format-y2k -Wundef \ 108 -Wformat -Wformat-security -Wno-format-y2k -Wundef \
@@ -92,7 +112,6 @@ global_cppflags += \
92 112
93 113
94global_cxxflags += \ 114global_cxxflags += \
95 $(SYMBOL_VISIBILITY_INLINES) \
96 -fno-rtti 115 -fno-rtti
97 116
98# -no-undefined required for building DLLs on Windows 117# -no-undefined required for building DLLs on Windows
@@ -103,51 +122,21 @@ version_script = -export-symbols-regex "^(webkit_|k?JS).*"
103endif 122endif
104 123
105if OS_GNU 124if OS_GNU
106version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter 125version_script = -Wl,--version-script,$(srcdir)/Source/autotools/symbols.filter
107endif 126endif
108 127
109# Convenience libraries
110noinst_LTLIBRARIES += \
111 libJavaScriptCore.la
112
113nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
114 $(javascriptcore_built_nosources)
115
116nodist_libJavaScriptCore_la_SOURCES = \
117 $(javascriptcore_built_sources)
118
119libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
120libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
121
122libJavaScriptCore_la_SOURCES = \
123 $(javascriptcore_sources)
124
125libJavaScriptCore_la_LIBADD = \
126 $(UNICODE_LIBS) \
127 $(GLIB_LIBS) \
128 -lpthread
129
130libJavaScriptCore_la_CXXFLAGS = \
131 $(global_cxxflags) \
132 $(libJavaScriptCore_la_CFLAGS)
133
134libJavaScriptCore_la_CFLAGS = \
135 -fstrict-aliasing \
136 -O3 \
137 $(global_cflags) \
138 $(GLIB_CFLAGS) \
139 $(UNICODE_CFLAGS)
140
141libJavaScriptCore_la_CPPFLAGS = \
142 $(global_cppflags) \
143 $(javascriptcore_cppflags)
144
145# Extra checks and flags 128# Extra checks and flags
146global_cppflags += \ 129global_cppflags += \
147 -DBUILDING_CAIRO__=1 \ 130 -DBUILDING_CAIRO__=1 \
148 -DBUILDING_GTK__=1 \ 131 -DBUILDING_GTK__=1 \
149 -DWTF_CHANGES 132 -DWTF_CHANGES
150 133
134# For the Gtk port we want to use XP_UNIX both in X11 and Mac
135if !TARGET_WIN32
136global_cppflags += \
137 -DXP_UNIX
138endif
139
151if USE_ICU_UNICODE 140if USE_ICU_UNICODE
152global_cppflags += \ 141global_cppflags += \
153 -DWTF_USE_ICU_UNICODE=1 142 -DWTF_USE_ICU_UNICODE=1
@@ -178,7 +167,6 @@ endif
178 167
179if !ENABLE_DEBUG 168if !ENABLE_DEBUG
180global_cppflags += -DNDEBUG 169global_cppflags += -DNDEBUG
181global_cflags += $(SYMBOL_VISIBILITY)
182else 170else
183global_cppflags += \ 171global_cppflags += \
184 -DG_DISABLE_DEPRECATED \ 172 -DG_DISABLE_DEPRECATED \
@@ -198,17 +186,26 @@ global_cppflags += \
198endif 186endif
199 187
200EXTRA_DIST += \ 188EXTRA_DIST += \
201 $(srcdir)/autotools/symbols.filter \ 189 $(srcdir)/Source/autotools/symbols.filter \
202 $(srcdir)/gtk-doc.make \ 190 $(srcdir)/gtk-doc.make \
203 $(srcdir)/WebKit/LICENSE 191 $(srcdir)/Source/WebKit/LICENSE
204 192
205# Include module makefiles 193# Include module makefiles
206include JavaScriptCore/GNUmakefile.am 194include Source/JavaScriptCore/GNUmakefile.am
207include WebCore/GNUmakefile.am 195include Source/WebCore/GNUmakefile.am
208include WebKit/gtk/GNUmakefile.am 196include Source/WebKit/gtk/GNUmakefile.am
209include WebCore/bindings/gobject/GNUmakefile.am 197include Source/WebCore/bindings/gobject/GNUmakefile.am
210include WebKitTools/GNUmakefile.am 198include Tools/GNUmakefile.am
211include WebKit/gtk/po/GNUmakefile.am 199include Source/WebKit/gtk/po/GNUmakefile.am
200include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
201
202if ENABLE_WEBKIT2
203include Source/WebKit2/GNUmakefile.am
204include Tools/MiniBrowser/gtk/GNUmakefile.am
205include Tools/WebKitTestRunner/GNUmakefile.am
206# [GTK] Refactor the translations now that we have webkit2
207# https://bugs.webkit.org/show_bug.cgi?id=55153
208endif
212 209
213# Autogenerated sources 210# Autogenerated sources
214BUILT_SOURCES += \ 211BUILT_SOURCES += \
@@ -229,11 +226,11 @@ MAINTAINERCLEANFILES += \
229 $(builddir)/doltcompile \ 226 $(builddir)/doltcompile \
230 $(builddir)/doltlibtool \ 227 $(builddir)/doltlibtool \
231 $(srcdir)/aconfig.h.in \ 228 $(srcdir)/aconfig.h.in \
232 $(srcdir)/autotools/config.* \ 229 $(srcdir)/Source/autotools/config.* \
233 $(srcdir)/autotools/compile \ 230 $(srcdir)/Source/autotools/compile \
234 $(srcdir)/autotools/depcomp \ 231 $(srcdir)/Source/autotools/depcomp \
235 $(srcdir)/autotools/install-sh \ 232 $(srcdir)/Source/autotools/install-sh \
236 $(srcdir)/autotools/missing \ 233 $(srcdir)/Source/autotools/missing \
237 $(srcdir)/configure \ 234 $(srcdir)/configure \
238 $(srcdir)/GNUmakefile.in \ 235 $(srcdir)/GNUmakefile.in \
239 $(srcdir)/INSTALL \ 236 $(srcdir)/INSTALL \
@@ -242,7 +239,7 @@ MAINTAINERCLEANFILES += \
242 239
243# Older automake versions (1.7) place Plo files in a different place so we need 240# Older automake versions (1.7) place Plo files in a different place so we need
244# to create the output directory manually. 241# to create the output directory manually.
245all-local: 242all-local: stamp-po
246 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources 243 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
247 244
248# remove built sources and program directories 245# remove built sources and program directories
diff --git a/meta/recipes-sato/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile
index cdee9da..065f88f 100644
--- a/meta/recipes-sato/webkit/files/Makefile
+++ b/meta/recipes-sato/webkit/files/Makefile
@@ -1,4 +1,4 @@
1MODULES = JavaScriptCore JavaScriptGlue ANGLE WebCore WebKit WebKit2 WebKitTools 1MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore Source/WebKit Source/WebKit2 Tools
2 2
3all: 3all:
4 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 4 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
diff --git a/meta/recipes-sato/webkit/files/Makefile.shared b/meta/recipes-sato/webkit/files/Makefile.shared
index aa9fa72..56ed978 100644
--- a/meta/recipes-sato/webkit/files/Makefile.shared
+++ b/meta/recipes-sato/webkit/files/Makefile.shared
@@ -1,4 +1,4 @@
1SCRIPTS_PATH ?= ../WebKitTools/Scripts 1SCRIPTS_PATH ?= ../Tools/Scripts
2XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) 2XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
3 3
4all: 4all:
diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 60b163d..23639e8 100755
--- a/meta/recipes-sato/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
@@ -8,55 +8,16 @@ test -z "$srcdir" && srcdir=.
8ORIGDIR=`pwd` 8ORIGDIR=`pwd`
9cd $srcdir 9cd $srcdir
10 10
11GTKDOCIZE_FLAGS="--copy" 11rm -f $top_srcdir/autom4te.cache
12LIBTOOLIZE_FLAGS="--force --automake"
13ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
14AUTOMAKE_FLAGS="--foreign --add-missing"
15 12
16DIE=0 13touch README INSTALL
17
18(autoconf --version) < /dev/null > /dev/null 2>&1 || {
19 echo
20 echo "You must have autoconf installed to compile $PROJECT."
21 echo "Install the appropriate package for your distribution,"
22 echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
23 DIE=1
24}
25
26(automake --version) < /dev/null > /dev/null 2>&1 || {
27 echo
28 echo "You must have automake installed to compile $PROJECT."
29 echo "Install the appropriate package for your distribution,"
30 echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
31 DIE=1
32}
33
34LIBTOOLIZE=libtoolize
35($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
36 LIBTOOLIZE=glibtoolize
37 ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
38 echo
39 echo "You must have libtool installed to compile $PROJECT."
40 echo "Install the appropriate package for your distribution,"
41 echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
42 DIE=1
43 }
44}
45 14
46if test "$DIE" -eq 1; then 15gtkdocize --copy > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
16if test -z `which autoreconf`; then
17 echo "Error: autoreconf not found, please install it."
47 exit 1 18 exit 1
48fi 19fi
49 20autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
50rm -rf $top_srcdir/autom4te.cache
51
52touch README INSTALL
53
54gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
55aclocal $ACLOCAL_FLAGS || exit $?
56$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
57autoheader || exit $?
58automake $AUTOMAKE_FLAGS || exit $?
59autoconf || exit $?
60 21
61cd $ORIGDIR || exit 1 22cd $ORIGDIR || exit 1
62 23
diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index bb703b4..9d8ad90 100644
--- a/meta/recipes-sato/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
@@ -1,21 +1,21 @@
1AC_PREREQ(2.59) 1AC_PREREQ(2.59)
2 2
3m4_define([webkit_major_version], [1]) 3m4_define([webkit_major_version], [1])
4m4_define([webkit_minor_version], [3]) 4m4_define([webkit_minor_version], [5])
5m4_define([webkit_micro_version], [7]) 5m4_define([webkit_micro_version], [1])
6 6
7# This is the version we'll be using as part of our User-Agent string 7# This is the version we'll be using as part of our User-Agent string
8# e.g., AppleWebKit/$(webkit_user_agent_version) ... 8# e.g., AppleWebKit/$(webkit_user_agent_version) ...
9# 9#
10# Sourced from WebCore/Configurations/Version.xcconfig 10# Sourced from Source/WebCore/Configurations/Version.xcconfig
11m4_define([webkit_user_agent_major_version], [534]) 11m4_define([webkit_user_agent_major_version], [534])
12m4_define([webkit_user_agent_minor_version], [7]) 12m4_define([webkit_user_agent_minor_version], [26])
13 13
14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) 14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
15 15
16AC_CONFIG_MACRO_DIR([autotools]) 16AC_CONFIG_MACRO_DIR([Source/autotools])
17AC_CONFIG_AUX_DIR([autotools]) 17AC_CONFIG_AUX_DIR([Source/autotools])
18AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools") 18AC_SUBST(ACLOCAL_AMFLAGS, "-I Source/autotools")
19 19
20AC_CONFIG_HEADERS([autotoolsconfig.h]) 20AC_CONFIG_HEADERS([autotoolsconfig.h])
21AC_CANONICAL_HOST 21AC_CANONICAL_HOST
@@ -31,11 +31,11 @@ AC_SUBST(WEBKIT_MICRO_VERSION)
31AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION) 31AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
32AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION) 32AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
33 33
34AC_CONFIG_SRCDIR([WebCore/config.h]) 34AC_CONFIG_SRCDIR([Source/WebCore/config.h])
35 35
36dnl # Libtool library version, not to confuse with API version 36dnl # Libtool library version, not to confuse with API version
37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html 37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
38LIBWEBKITGTK_VERSION=4:0:4 38LIBWEBKITGTK_VERSION=8:0:8
39AC_SUBST([LIBWEBKITGTK_VERSION]) 39AC_SUBST([LIBWEBKITGTK_VERSION])
40 40
41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) 41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -99,6 +99,13 @@ if test -z "$GPERF"; then
99 AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) 99 AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
100fi 100fi
101 101
102# Disable C++0x compat warnings for GCC >= 4.6.0 until we build
103# cleanly with that.
104if test "$CXX" = "g++"; then
105 CXX_VERSION=`$CXX -dumpversion`
106 AX_COMPARE_VERSION([$CXX_VERSION],[ge],[4.6.0],CXXFLAGS="$CXXFLAGS -Wno-c++0x-compat")
107fi
108
102# pthread (not needed on Windows) 109# pthread (not needed on Windows)
103if test "$os_win32" = "no"; then 110if test "$os_win32" = "no"; then
104AC_CHECK_HEADERS([pthread.h], 111AC_CHECK_HEADERS([pthread.h],
@@ -199,14 +206,14 @@ case "$with_gtk" in
199 GAIL_PC_NAME=gail 206 GAIL_PC_NAME=gail
200 GAIL_REQUIRED_VERSION=1.8 207 GAIL_REQUIRED_VERSION=1.8
201 ;; 208 ;;
202 3.0) GTK_REQUIRED_VERSION=2.91 209 3.0) GTK_REQUIRED_VERSION=3.0
203 GTK_API_VERSION=3.0 210 GTK_API_VERSION=3.0
204 WEBKITGTK_API_MAJOR_VERSION=3 211 WEBKITGTK_API_MAJOR_VERSION=3
205 WEBKITGTK_API_MINOR_VERSION=0 212 WEBKITGTK_API_MINOR_VERSION=0
206 WEBKITGTK_API_VERSION=3.0 213 WEBKITGTK_API_VERSION=3.0
207 WEBKITGTK_PC_NAME=webkitgtk 214 WEBKITGTK_PC_NAME=webkitgtk
208 GAIL_PC_NAME=gail-3.0 215 GAIL_PC_NAME=gail-3.0
209 GAIL_REQUIRED_VERSION=2.90.4 216 GAIL_REQUIRED_VERSION=3.0
210 ;; 217 ;;
211esac 218esac
212 219
@@ -247,8 +254,8 @@ if test "$with_hildon" = "yes"; then
247fi 254fi
248 255
249# minimum base dependencies 256# minimum base dependencies
250LIBSOUP_REQUIRED_VERSION=2.28.2 257LIBSOUP_REQUIRED_VERSION=2.33.6
251CAIRO_REQUIRED_VERSION=1.6 258CAIRO_REQUIRED_VERSION=1.10
252FONTCONFIG_REQUIRED_VERSION=2.4 259FONTCONFIG_REQUIRED_VERSION=2.4
253FREETYPE2_REQUIRED_VERSION=9.0 260FREETYPE2_REQUIRED_VERSION=9.0
254LIBXML_REQUIRED_VERSION=2.6 261LIBXML_REQUIRED_VERSION=2.6
@@ -271,16 +278,6 @@ ENCHANT_REQUIRED_VERSION=0.22
271# todo: webcore gtk 278# todo: webcore gtk
272WEBKIT_CHECK_DEPENDENCIES([glib unicode]) 279WEBKIT_CHECK_DEPENDENCIES([glib unicode])
273 280
274# Check if we can use GSettings
275PKG_CHECK_MODULES([GSETTINGS],
276 [gio-2.0 >= 2.25.0],
277 [have_gsettings=yes],
278 [have_gsettings=no])
279if test "$have_gsettings" = "yes"; then
280 AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
281 GLIB_GSETTINGS
282fi
283
284GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION 281GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
285AC_SUBST(GETTEXT_PACKAGE) 282AC_SUBST(GETTEXT_PACKAGE)
286AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", 283AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
@@ -296,9 +293,17 @@ PKG_CHECK_MODULES(PANGO,
296AC_SUBST(PANGO_CFLAGS) 293AC_SUBST(PANGO_CFLAGS)
297AC_SUBST(PANGO_LIBS) 294AC_SUBST(PANGO_LIBS)
298 295
299PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION) 296AC_MSG_CHECKING([whether to enable spellcheck support])
297AC_ARG_ENABLE([spellcheck],
298 [AS_HELP_STRING([--enable-spellcheck],[enable support for spellcheck])],
299 [],[enable_spellcheck="yes"])
300AC_MSG_RESULT([$enable_spellcheck])
301
302if test "$enable_spellcheck" = "yes"; then
303PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION, [], [enable_spellcheck="no"])
300AC_SUBST(ENCHANT_CFLAGS) 304AC_SUBST(ENCHANT_CFLAGS)
301AC_SUBST(ENCHANT_LIBS) 305AC_SUBST(ENCHANT_LIBS)
306fi
302 307
303PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION) 308PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
304AC_SUBST(GAIL_CFLAGS) 309AC_SUBST(GAIL_CFLAGS)
@@ -357,13 +362,28 @@ AC_ARG_ENABLE(optimizations,
357 [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi]) 362 [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
358AC_MSG_RESULT([$enable_optimizations]) 363AC_MSG_RESULT([$enable_optimizations])
359 364
360# check whether to enable 3D transforms support 365# check whether to enable 3D rendering support
361AC_MSG_CHECKING([whether to enable support for 3D Transforms]) 366AC_MSG_CHECKING([whether to enable support for 3D Rendering])
362AC_ARG_ENABLE(3D_transforms, 367AC_ARG_ENABLE(3d_rendering,
363 AC_HELP_STRING([--enable-3D-transforms], 368 AC_HELP_STRING([--enable-3d-rendering],
364 [enable support for 3D transforms [default=no]]), 369 [enable support for 3D Rendering (experimental) [default=no]]),
365 [],[enable_3D_transforms="no"]) 370 [],[enable_3d_rendering="no"])
366AC_MSG_RESULT([$enable_3D_transforms]) 371AC_MSG_RESULT([$enable_3d_rendering])
372
373# check whether to enable WebGL support
374AC_MSG_CHECKING([whether to enable WebGL support])
375AC_ARG_ENABLE(webgl,
376 AC_HELP_STRING([--enable-webgl],
377 [enable support for WebGL (experimental) [default=no]]),
378 [], [enable_webgl="no"])
379AC_MSG_RESULT([$enable_webgl])
380
381if test "$enable_webgl" = "yes"; then
382 AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
383 AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
384 OPENGL_LIBS=-lGL
385fi
386AC_SUBST([OPENGL_LIBS])
367 387
368# check whether to enable channel messaging support 388# check whether to enable channel messaging support
369AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support]) 389AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
@@ -373,6 +393,38 @@ AC_ARG_ENABLE(channel_messaging,
373 [],[enable_channel_messaging="yes"]) 393 [],[enable_channel_messaging="yes"])
374AC_MSG_RESULT([$enable_channel_messaging]) 394AC_MSG_RESULT([$enable_channel_messaging])
375 395
396# check whether to enable notifications
397AC_MSG_CHECKING([whether to enable notifications])
398AC_ARG_ENABLE(notifications,
399 AC_HELP_STRING([--enable-notifications],
400 [enable notifications [default=no]]),
401 [],[enable_notifications="no"])
402AC_MSG_RESULT([$enable_notifications])
403
404# check whether to enable the meter tag
405AC_MSG_CHECKING([whether to enable HTML5 meter tag])
406AC_ARG_ENABLE(meter_tag,
407 AC_HELP_STRING([--enable-meter-tag],
408 [enable HTML5 meter [default=yes]]),
409 [],[enable_meter_tag="yes"])
410AC_MSG_RESULT([$enable_meter_tag])
411
412# check whether to enable page visibility API.
413AC_MSG_CHECKING([whether to enable Page Visibility API support])
414AC_ARG_ENABLE(page_visibility_api,
415 AC_HELP_STRING([--enable-page-visibility-api],
416 [enable page visibility api[default=no]]),
417 [],[enable_page_visibility_api="no"])
418AC_MSG_RESULT([$enable_page_visibility_api])
419
420# check whether to enable the progress tag
421AC_MSG_CHECKING([whether to enable HTML5 progress tag])
422AC_ARG_ENABLE(progress_tag,
423 AC_HELP_STRING([--enable-progress-tag],
424 [enable HTML5 progress [default=yes]]),
425 [],[enable_progress_tag="yes"])
426AC_MSG_RESULT([$enable_progress_tag])
427
376# check whether to enable JavaScript debugger/profiler support 428# check whether to enable JavaScript debugger/profiler support
377AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support]) 429AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
378AC_ARG_ENABLE(javascript_debugger, 430AC_ARG_ENABLE(javascript_debugger,
@@ -381,6 +433,22 @@ AC_ARG_ENABLE(javascript_debugger,
381 [],[enable_javascript_debugger="yes"]) 433 [],[enable_javascript_debugger="yes"])
382AC_MSG_RESULT([$enable_javascript_debugger]) 434AC_MSG_RESULT([$enable_javascript_debugger])
383 435
436# check whether to build with datagrid support
437AC_MSG_CHECKING([whether to enable HTML5 datagrid support])
438AC_ARG_ENABLE(datagrid,
439 AC_HELP_STRING([--enable-datagrid],
440 [enable HTML5 datagrid support [default=no]]),
441 [],[enable_datagrid="no"])
442AC_MSG_RESULT([$enable_datagrid])
443
444# check whether to build with data transfer items support
445AC_MSG_CHECKING([whether to enable HTML5 data transfer items support])
446AC_ARG_ENABLE(data_transfer_items,
447 AC_HELP_STRING([--enable-data-transfer-items],
448 [enable HTML5 data transfer items support [default=no]]),
449 [],[enable_data_transfer_items="no"])
450AC_MSG_RESULT([$enable_data_transfer_items])
451
384# check whether to enable HTML5 Offline Web Applications support 452# check whether to enable HTML5 Offline Web Applications support
385AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) 453AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
386AC_ARG_ENABLE(offline_web_applications, 454AC_ARG_ENABLE(offline_web_applications,
@@ -400,11 +468,19 @@ AC_MSG_RESULT([$enable_dom_storage])
400# check whether to enable the indexed database API 468# check whether to enable the indexed database API
401AC_MSG_CHECKING([whether to enable the indexed database API]) 469AC_MSG_CHECKING([whether to enable the indexed database API])
402AC_ARG_ENABLE(indexed_database, 470AC_ARG_ENABLE(indexed_database,
403 AC_HELP_STRING([--enable-indexeddb], 471 AC_HELP_STRING([--enable-indexed-database],
404 [enable the indexed database API [default=no]]), 472 [enable the indexed database API [default=no]]),
405 [],[enable_indexed_database="no"]) 473 [],[enable_indexed_database="no"])
406AC_MSG_RESULT([$enable_indexed_database]) 474AC_MSG_RESULT([$enable_indexed_database])
407 475
476# check whether to enable the color input
477AC_MSG_CHECKING([whether to enable the color input])
478AC_ARG_ENABLE(input_color,
479 AC_HELP_STRING([--enable-input-color],
480 [enable the color input [default=no]]),
481 [],[enable_input_color="no"])
482AC_MSG_RESULT([$enable_input_color])
483
408# check whether to enable the speech input API 484# check whether to enable the speech input API
409AC_MSG_CHECKING([whether to enable the speech input API]) 485AC_MSG_CHECKING([whether to enable the speech input API])
410AC_ARG_ENABLE(input_speech, 486AC_ARG_ENABLE(input_speech,
@@ -469,6 +545,43 @@ AC_ARG_ENABLE(video,
469 [],[enable_video="yes"]) 545 [],[enable_video="yes"])
470AC_MSG_RESULT([$enable_video]) 546AC_MSG_RESULT([$enable_video])
471 547
548# turn off video features if --disable-video is requested
549if test "$enable_video" = "no"; then
550 enable_video_track=no
551fi
552
553# check whether to enable HTML5 video track support
554AC_MSG_CHECKING([whether to enable HTML5 video track support])
555AC_ARG_ENABLE(video_track,
556 AC_HELP_STRING([--enable-video-track],
557 [enable HTML5 video track support [default=yes]]),
558 [],[enable_video_track="yes"])
559AC_MSG_RESULT([$enable_video_track])
560
561# check whether to enable media statistics support
562AC_MSG_CHECKING([whether to enable media statistics support])
563AC_ARG_ENABLE(media_statistics,
564 AC_HELP_STRING([--enable-media-statistics],
565 [enable support for media statistics [default=no]]),
566 [], [enable_media_statistics="no"])
567AC_MSG_RESULT([$enable_media_statistics])
568
569# check whether to enable Javascript Fullscreen API support
570AC_MSG_CHECKING([whether to enable Fullscreen API support])
571AC_ARG_ENABLE(fullscreen_api,
572 AC_HELP_STRING([--enable-fullscreen-api],
573 [enable the Fullscreen API support [default=yes]]),
574 [],[enable_fullscreen_api="yes"])
575AC_MSG_RESULT([$enable_fullscreen_api])
576
577# check whether to enable media stream support
578AC_MSG_CHECKING([whether to enable media stream support])
579AC_ARG_ENABLE(media_stream,
580 AC_HELP_STRING([--enable-media-stream],
581 [enable media stream support (incomplete) [default=no]]),
582 [],[enable_media_stream="no"])
583AC_MSG_RESULT([$enable_media_stream])
584
472# check whether to enable XHTML-MP support 585# check whether to enable XHTML-MP support
473AC_MSG_CHECKING([whether to enable XHTML-MP support]) 586AC_MSG_CHECKING([whether to enable XHTML-MP support])
474AC_ARG_ENABLE(xhtmlmp, 587AC_ARG_ENABLE(xhtmlmp,
@@ -501,6 +614,14 @@ AC_ARG_ENABLE(geolocation,
501 [],[enable_geolocation="no"]) 614 [],[enable_geolocation="no"])
502AC_MSG_RESULT([$enable_geolocation]) 615AC_MSG_RESULT([$enable_geolocation])
503 616
617# check whether to enable client-based geolocation support
618AC_MSG_CHECKING([whether to enable client-based geolocation support])
619AC_ARG_ENABLE(client_based_geolocation,
620 AC_HELP_STRING([--enable-client-based-geolocation],
621 [enable support for client-based geolocation [default=no]]),
622 [],[enable_client_based_geolocation="no"])
623AC_MSG_RESULT([$enable_client_based_geolocation])
624
504# check whether to enable MathML support 625# check whether to enable MathML support
505AC_MSG_CHECKING([whether to enable MathML support]) 626AC_MSG_CHECKING([whether to enable MathML support])
506AC_ARG_ENABLE(mathml, 627AC_ARG_ENABLE(mathml,
@@ -517,13 +638,13 @@ AC_ARG_ENABLE(svg,
517 [],[enable_svg="yes"]) 638 [],[enable_svg="yes"])
518AC_MSG_RESULT([$enable_svg]) 639AC_MSG_RESULT([$enable_svg])
519 640
520# check whether to enable WML support 641# check whether to enable WCSS support
521AC_MSG_CHECKING([whether to enable WML support]) 642AC_MSG_CHECKING([whether to enable WCSS support])
522AC_ARG_ENABLE(wml, 643AC_ARG_ENABLE(wcss,
523 AC_HELP_STRING([--enable-wml], 644 AC_HELP_STRING([--enable-wcss],
524 [enable support for WML [default=no]]), 645 [enable support for WCSS [default=no]]),
525 [],[enable_wml="no"]) 646 [],[enable_wcss="no"])
526AC_MSG_RESULT([$enable_wml]) 647AC_MSG_RESULT([$enable_wcss])
527 648
528# check whether to enable SharedWorkers support 649# check whether to enable SharedWorkers support
529AC_MSG_CHECKING([whether to enable SharedWorkers support]) 650AC_MSG_CHECKING([whether to enable SharedWorkers support])
@@ -557,6 +678,14 @@ AC_ARG_ENABLE(file_system,
557 [], [enable_file_system="no"]) 678 [], [enable_file_system="no"])
558AC_MSG_RESULT([$enable_file_system]) 679AC_MSG_RESULT([$enable_file_system])
559 680
681# check whether to enable Quota API support
682AC_MSG_CHECKING([whether to enable Quota API support])
683AC_ARG_ENABLE(quota,
684 AC_HELP_STRING([--enable-quota],
685 [enable support for Quota API [default=no]]),
686 [], [enable_quota="no"])
687AC_MSG_RESULT([$enable_quota])
688
560# turn off svg features if --disable-svg is requested 689# turn off svg features if --disable-svg is requested
561if test "$enable_svg" = "no"; then 690if test "$enable_svg" = "no"; then
562 enable_svg_animation=no 691 enable_svg_animation=no
@@ -635,6 +764,14 @@ AC_ARG_ENABLE(web_sockets,
635 [],[enable_web_sockets="yes"]) 764 [],[enable_web_sockets="yes"])
636AC_MSG_RESULT([$enable_web_sockets]) 765AC_MSG_RESULT([$enable_web_sockets])
637 766
767# check whether to enable Web Audio support
768AC_MSG_CHECKING([whether to enable Web Audio support])
769AC_ARG_ENABLE(web_audio,
770 AC_HELP_STRING([--enable-web-audio],
771 [enable support for Web Audio [default=no]]),
772 [],[enable_web_audio="no"])
773AC_MSG_RESULT([$enable_web_audio])
774
638# check whether to enable Web Timing support 775# check whether to enable Web Timing support
639AC_MSG_CHECKING([whether to enable Web Timing support]) 776AC_MSG_CHECKING([whether to enable Web Timing support])
640AC_ARG_ENABLE(web_timing, 777AC_ARG_ENABLE(web_timing,
@@ -647,8 +784,8 @@ AC_MSG_RESULT([$enable_web_timing])
647AC_MSG_CHECKING([whether to enable Blob support]) 784AC_MSG_CHECKING([whether to enable Blob support])
648AC_ARG_ENABLE(blob, 785AC_ARG_ENABLE(blob,
649 AC_HELP_STRING([--enable-blob], 786 AC_HELP_STRING([--enable-blob],
650 [enable support for Blob [default=no]]), 787 [enable support for Blob [default=yes]]),
651 [],[enable_blob="no"]) 788 [],[enable_blob="yes"])
652AC_MSG_RESULT([$enable_blob]) 789AC_MSG_RESULT([$enable_blob])
653 790
654# check whether to enable Fast Mobile Scrolling support 791# check whether to enable Fast Mobile Scrolling support
@@ -675,6 +812,22 @@ AC_ARG_ENABLE(fast_malloc,
675 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) 812 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
676AC_MSG_RESULT([$enable_fast_malloc]) 813AC_MSG_RESULT([$enable_fast_malloc])
677 814
815# check whether to enable debug symbols
816AC_MSG_CHECKING([whether to enable debug symbols])
817AC_ARG_ENABLE(debug_symbols,
818 AC_HELP_STRING([--enable-debug-symbols],
819 [enable debug symbols default=no, default=yes for debug builds]),
820 [],[if test "$enable_debug" = "yes"; then enable_debug_symbols="yes"; else enable_debug_symbols="no"; fi])
821AC_MSG_RESULT([$enable_debug_symbols])
822
823# check whether to enable debug features
824AC_MSG_CHECKING([whether to enable debug features])
825AC_ARG_ENABLE(debug_features,
826 AC_HELP_STRING([--enable-debug-features],
827 [enable debug features default=no, default=yes for debug builds]),
828 [],[if test "$enable_debug" = "yes"; then enable_debug_features="yes"; else enable_debug_features="no"; fi])
829AC_MSG_RESULT([$enable_debug_features])
830
678AC_MSG_CHECKING([whether to enable JIT compilation]) 831AC_MSG_CHECKING([whether to enable JIT compilation])
679AC_ARG_ENABLE([jit], 832AC_ARG_ENABLE([jit],
680 AC_HELP_STRING([--enable-jit], 833 AC_HELP_STRING([--enable-jit],
@@ -704,6 +857,12 @@ if test "$enable_jit" = "yes"; then
704 ;; 857 ;;
705 esac 858 esac
706 ;; 859 ;;
860 sh4)
861 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
862 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
863 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
864 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
865 ;;
707 *) 866 *)
708 enable_jit="no (CPU '$host_cpu' not supported)" 867 enable_jit="no (CPU '$host_cpu' not supported)"
709 ;; 868 ;;
@@ -745,6 +904,38 @@ AC_ARG_ENABLE([introspection],
745 [],[enable_introspection=no]) 904 [],[enable_introspection=no])
746AC_MSG_RESULT([$enable_introspection]) 905AC_MSG_RESULT([$enable_introspection])
747 906
907# check whether to enable animation API
908AC_MSG_CHECKING([whether to enable Animation API support])
909AC_ARG_ENABLE(animation_api,
910 AC_HELP_STRING([--enable-animation-api],
911 [enable support for Animation API (experimental) [default=no]]),
912 [], [enable_animation_api="no"])
913AC_MSG_RESULT([$enable_animation_api])
914
915# check whether to enable touch icon loading
916AC_MSG_CHECKING([whether to enable touch icon loading])
917AC_ARG_ENABLE(touch_icon_loading,
918 AC_HELP_STRING([--enable-touch-icon-loading],
919 [enable support for loading touch icons [default=no]]),
920 [], [enable_touch_icon_loading="no"])
921AC_MSG_RESULT([$enable_touch_icon_loading])
922
923# check whether to enable Register Protocol Handler support
924AC_MSG_CHECKING([whether to enable Register Protocol Handler])
925AC_ARG_ENABLE(register_protocol_handler,
926 AC_HELP_STRING([--enable-register-protocol-handler],
927 [enable support for Register Protocol Handler (experimental) [default=no]]),
928 [],[enable_register_protocol_handler="no"])
929AC_MSG_RESULT([$enable_register_protocol_handler])
930
931# check whether to enable DeviceOrientation support
932AC_MSG_CHECKING([whether to enable DeviceOrientation])
933AC_ARG_ENABLE(device_orientation,
934 AC_HELP_STRING([--enable-device-orientation],
935 [enable support for DeviceOrientation (experimental and incomplete) [default=no]]),
936 [],[enable_device_orientation="no"])
937AC_MSG_RESULT([$enable_device_orientation])
938
748G_IR_SCANNER= 939G_IR_SCANNER=
749G_IR_COMPILER= 940G_IR_COMPILER=
750G_IR_GENERATE= 941G_IR_GENERATE=
@@ -778,11 +969,18 @@ case "$with_font_backend" in
778esac 969esac
779AC_MSG_RESULT([$with_font_backend]) 970AC_MSG_RESULT([$with_font_backend])
780 971
781# Add '-g' flag to gcc if it's debug build 972if test "$host_cpu" = "sh4"; then
782if test "$enable_debug" = "yes"; then 973 CXXFLAGS="$CXXFLAGS -mieee -w"
974 CFLAGS="$CFLAGS -mieee -w"
975fi
976
977# Add '-g' flag to gcc to build with debug symbols
978if test "$enable_debug_symbols" = "yes"; then
783 CXXFLAGS="$CXXFLAGS -g" 979 CXXFLAGS="$CXXFLAGS -g"
784 CFLAGS="$CFLAGS -g" 980 CFLAGS="$CFLAGS -g"
785else 981fi
982
983if test "$enable_debug_features" = "no"; then
786 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) 984 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
787fi 985fi
788 986
@@ -800,15 +998,6 @@ PKG_CHECK_MODULES([LIBSOUP],
800AC_SUBST([LIBSOUP_CFLAGS]) 998AC_SUBST([LIBSOUP_CFLAGS])
801AC_SUBST([LIBSOUP_LIBS]) 999AC_SUBST([LIBSOUP_LIBS])
802 1000
803# check if we can use libSoup 2.29.90 features
804PKG_CHECK_MODULES([LIBSOUP_2_29_90],
805 [libsoup-2.4 >= 2.29.90],
806 [have_libsoup_2_29_90=yes],
807 [have_libsoup_2_29_90=no])
808if test "$have_libsoup_2_29_90" = "yes"; then
809 AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
810fi
811
812# check if FreeType/FontConfig are available 1001# check if FreeType/FontConfig are available
813if test "$with_font_backend" = "freetype"; then 1002if test "$with_font_backend" = "freetype"; then
814 if test "$with_target" = "directfb"; then 1003 if test "$with_target" = "directfb"; then
@@ -825,22 +1014,26 @@ if test "$with_font_backend" = "freetype"; then
825 AC_SUBST([FREETYPE_LIBS]) 1014 AC_SUBST([FREETYPE_LIBS])
826fi 1015fi
827 1016
828# check if sqlite 3 is available 1017# check if SQLite3 is available. Error out only if one of the
829if test "$enable_icon_database" = "yes" || \ 1018# features hard-depending on it is enabled while SQLite3 is
1019# unavailable.
1020PKG_CHECK_MODULES([SQLITE3],
1021 [sqlite3 >= $SQLITE_REQUIRED_VERSION],
1022 [sqlite3_has_pkg_config=yes],
1023 [sqlite3_has_pkg_config=no])
1024if test "$sqlite3_has_pkg_config" = "no"; then
1025 AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
1026 [sqlite3_found=yes;SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
1027 [sqlite3_found=no])
1028fi
1029AC_SUBST([SQLITE3_CFLAGS])
1030AC_SUBST([SQLITE3_LIBS])
1031
1032if (test "$sqlite3_found" = "no") && (test "$enable_icon_database" = "yes" || \
830 test "$enable_database" = "yes" || \ 1033 test "$enable_database" = "yes" || \
831 test "$enable_offline_web_applications" = "yes" || \ 1034 test "$enable_offline_web_applications" = "yes" || \
832 test "$enable_dom_storage" = "yes"; then 1035 test "$enable_dom_storage" = "yes"); then
833 PKG_CHECK_MODULES([SQLITE3], 1036 AC_MSG_ERROR([SQLite3 is required for the Database related features])
834 [sqlite3 >= $SQLITE_REQUIRED_VERSION],
835 [sqlite3_has_pkg_config=yes],
836 [sqlite3_has_pkg_config=no])
837 if test "$sqlite3_has_pkg_config" = "no"; then
838 AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
839 [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
840 [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
841 fi
842 AC_SUBST([SQLITE3_CFLAGS])
843 AC_SUBST([SQLITE3_LIBS])
844fi 1037fi
845 1038
846# check if libxslt is available 1039# check if libxslt is available
@@ -857,6 +1050,14 @@ if test "$enable_geolocation" = "yes"; then
857 AC_SUBST([GEOCLUE_LIBS]) 1050 AC_SUBST([GEOCLUE_LIBS])
858fi 1051fi
859 1052
1053# check for XRender under Linux/Unix. Some linkers require explicit
1054# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
1055if test "$os_win32" = "no"; then
1056 PKG_CHECK_MODULES([XRENDER], [xrender])
1057 AC_SUBST([XRENDER_CFLAGS])
1058 AC_SUBST([XRENDER_LIBS])
1059fi
1060
860# check if gstreamer is available 1061# check if gstreamer is available
861if test "$enable_video" = "yes"; then 1062if test "$enable_video" = "yes"; then
862 PKG_CHECK_MODULES([GSTREAMER], 1063 PKG_CHECK_MODULES([GSTREAMER],
@@ -867,8 +1068,7 @@ if test "$enable_video" = "yes"; then
867 gstreamer-pbutils-0.10 1068 gstreamer-pbutils-0.10
868 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION 1069 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
869 gstreamer-video-0.10], 1070 gstreamer-video-0.10],
870 [have_gstreamer=yes], 1071 [have_gstreamer=yes])
871 [have_gstreamer=no])
872 1072
873 AC_SUBST([GSTREAMER_CFLAGS]) 1073 AC_SUBST([GSTREAMER_CFLAGS])
874 AC_SUBST([GSTREAMER_LIBS]) 1074 AC_SUBST([GSTREAMER_LIBS])
@@ -887,6 +1087,31 @@ if test "$enable_video" = "yes"; then
887 html_flags=yes 1087 html_flags=yes
888fi 1088fi
889 1089
1090# WebKit2
1091AC_MSG_CHECKING([whether to build Webkit2])
1092AC_ARG_ENABLE(webkit2,
1093 AC_HELP_STRING([--enable-webkit2],
1094 [build webkit2 [default=no]]),
1095 [], [enable_webkit2="no"])
1096AC_MSG_RESULT([$enable_webkit2])
1097if test "$enable_webkit2" = "yes"; then
1098 if test "$GTK_API_VERSION" = "2.0"; then
1099 AC_MSG_ERROR([WebKit2 requires GTK+ 3.x, use --with-gtk=3.0])
1100 fi
1101fi
1102
1103# Plugin Process
1104AC_MSG_CHECKING([whether to build plugin process for WebKit2])
1105AC_ARG_ENABLE(plugin_process,
1106 AC_HELP_STRING([--enable-plugin-process],
1107 [build plugin process for WebKit2 [default=yes]]),
1108 [], [enable_plugin_process="no"])
1109# Build the plugin process only when building webkit2.
1110if test "$enable_webkit2" = "no"; then
1111 enable_plugin_process=no
1112fi
1113AC_MSG_RESULT([$enable_plugin_process])
1114
890GTK_DOC_CHECK([1.10]) 1115GTK_DOC_CHECK([1.10])
891 1116
892# OS conditionals 1117# OS conditionals
@@ -910,37 +1135,49 @@ AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
910AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) 1135AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
911AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) 1136AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
912 1137
913# GLib/GIO feature conditionals
914AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])
915
916# GStreamer feature conditional 1138# GStreamer feature conditional
917AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"]) 1139AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
918 1140
919# WebKit feature conditionals 1141# WebKit feature conditionals
920AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) 1142AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
921AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) 1143AM_CONDITIONAL([ENABLE_3D_RENDERING],[test "$enable_3d_rendering" = "yes"])
1144AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
922AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"]) 1145AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
1146AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
1147AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api" = "yes"])
1148AM_CONDITIONAL([ENABLE_PROGRESS_TAG],[test "$enable_progress_tag" = "yes"])
923AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) 1149AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
924AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) 1150AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
925AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) 1151AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
926AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"]) 1152AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
1153AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"])
1154AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"])
927AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) 1155AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
928AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) 1156AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
929AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) 1157AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
1158AM_CONDITIONAL([ENABLE_DETAILS],[test "$enable_details" = "yes"])
930AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"]) 1159AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
931AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) 1160AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
932AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"]) 1161AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"])
1162AM_CONDITIONAL([ENABLE_QUOTA],[test "$enable_quota" = "yes"])
933AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 1163AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
934AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) 1164AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
935AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) 1165AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
1166AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"])
936AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) 1167AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
937AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"]) 1168AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
938AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) 1169AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
939AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) 1170AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
940AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) 1171AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
941AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) 1172AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
1173AM_CONDITIONAL([ENABLE_CLIENT_BASED_GEOLOCATION], [test "$enable_client_based_geolocation" = "yes"])
942AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) 1174AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
1175AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
943AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) 1176AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
1177AM_CONDITIONAL([ENABLE_MEDIA_STATISTICS],[test "$enable_media_statistics" = "yes"])
1178AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"])
1179AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"])
1180AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
944AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) 1181AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
945AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) 1182AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
946AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) 1183AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
@@ -951,35 +1188,54 @@ AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
951AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"]) 1188AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
952AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) 1189AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
953AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) 1190AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
954AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"]) 1191AM_CONDITIONAL([ENABLE_WCSS],[test "$enable_wcss" = "yes"])
955AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"]) 1192AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
956AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"]) 1193AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
957AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) 1194AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
958AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"]) 1195AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
959AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"]) 1196AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
1197AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
960AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) 1198AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
961AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"]) 1199AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
1200AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
1201AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"])
1202AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"])
1203AM_CONDITIONAL([ENABLE_ANIMATION_API],[test "$enable_animation_api" = "yes"])
1204AM_CONDITIONAL([ENABLE_TOUCH_ICON_LOADING],[test "$enable_touch_icon_loading" = "yes"])
1205AM_CONDITIONAL([ENABLE_REGISTER_PROTOCOL_HANDLER],[test "$enable_register_protocol_handler" = "yes"])
1206AM_CONDITIONAL([ENABLE_DEVICE_ORIENTATION],[test "$enable_device_orientation" = "yes"])
962 1207
963# Gtk conditionals 1208# Gtk conditionals
964AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) 1209AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
965 1210
966
967AC_CONFIG_FILES([ 1211AC_CONFIG_FILES([
968GNUmakefile 1212GNUmakefile
969WebKit/gtk/webkit/webkitversion.h 1213])
970WebKit/gtk/docs/GNUmakefile 1214
971WebKit/gtk/docs/version.xml 1215
972] 1216AC_CONFIG_FILES([
973) 1217Source/WebKit/gtk/webkit/webkitversion.h
1218Source/WebKit/gtk/docs/GNUmakefile
1219Source/WebKit/gtk/docs/version.xml
1220])
974 1221
975AC_CONFIG_FILES([ 1222AC_CONFIG_FILES([
976WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in 1223Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
977WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in 1224Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
978WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in 1225Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
1226Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in
979] 1227]
980,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1228,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
981) 1229)
982 1230
1231if test "$enable_webkit2" = "yes"; then
1232 AC_CONFIG_FILES([
1233 Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
1234 ]
1235 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
1236 )
1237fi
1238
983AC_OUTPUT 1239AC_OUTPUT
984 1240
985echo " 1241echo "
@@ -987,34 +1243,50 @@ WebKit was configured with the following options:
987 1243
988Build configuration: 1244Build configuration:
989 Enable debugging (slow) : $enable_debug 1245 Enable debugging (slow) : $enable_debug
1246 Compile with debug symbols (slow) : $enable_debug_symbols
1247 Enable debug features (slow) : $enable_debug_features
990 Enable GCC build optimization : $enable_optimizations 1248 Enable GCC build optimization : $enable_optimizations
991 Code coverage support : $enable_coverage 1249 Code coverage support : $enable_coverage
992 Unicode backend : $with_unicode_backend 1250 Unicode backend : $with_unicode_backend
993 Font backend : $with_font_backend 1251 Font backend : $with_font_backend
994 Optimized memory allocator : $enable_fast_malloc 1252 Optimized memory allocator : $enable_fast_malloc
995Features: 1253Features:
996 3D Transforms : $enable_3D_transforms 1254 3D Rendering : $enable_3d_rendering
1255 WebGL : $enable_webgl
997 Blob support : $enable_blob 1256 Blob support : $enable_blob
1257 DeviceOrientation support : $enable_device_orientation
998 Directory upload : $enable_directory_upload 1258 Directory upload : $enable_directory_upload
999 Fast Mobile Scrolling : $enable_fast_mobile_scrolling 1259 Fast Mobile Scrolling : $enable_fast_mobile_scrolling
1000 JIT compilation : $enable_jit 1260 JIT compilation : $enable_jit
1001 Filters support : $enable_filters 1261 Filters support : $enable_filters
1002 Geolocation support : $enable_geolocation 1262 Geolocation support : $enable_geolocation
1263 Client-based geolocation support : $enable_client_based_geolocation
1003 JavaScript debugger/profiler support : $enable_javascript_debugger 1264 JavaScript debugger/profiler support : $enable_javascript_debugger
1004 MathML support : $enable_mathml 1265 MathML support : $enable_mathml
1266 Media statistics : $enable_media_statistics
1005 HTML5 offline web applications support : $enable_offline_web_applications 1267 HTML5 offline web applications support : $enable_offline_web_applications
1006 HTML5 channel messaging support : $enable_channel_messaging 1268 HTML5 channel messaging support : $enable_channel_messaging
1269 HTML5 meter element support : $enable_meter_tag
1270 Page Visibility API support : $enable_page_visibility_api
1271 HTML5 progress element support : $enable_progress_tag
1007 HTML5 client-side session and persistent storage support : $enable_dom_storage 1272 HTML5 client-side session and persistent storage support : $enable_dom_storage
1008 HTML5 client-side database storage support : $enable_database 1273 HTML5 client-side database storage support : $enable_database
1274 HTML5 datagrid support : $enable_datagrid
1275 HTML5 data transfer items support : $enable_data_transfer_items
1009 HTML5 FileSystem API support : $enable_file_system 1276 HTML5 FileSystem API support : $enable_file_system
1277 Quota API support : $enable_quota
1010 HTML5 sandboxed iframe support : $enable_sandbox 1278 HTML5 sandboxed iframe support : $enable_sandbox
1011 HTML5 server-sent events support : $enable_eventsource 1279 HTML5 server-sent events support : $enable_eventsource
1012 HTML5 video element support : $enable_video 1280 HTML5 video element support : $enable_video
1281 HTML5 track element support : $enable_video_track
1282 Fullscreen API support : $enable_fullscreen_api
1283 Media stream support : $enable_media_stream
1013 Icon database support : $enable_icon_database 1284 Icon database support : $enable_icon_database
1014 Image resizer support : $enable_image_resizer 1285 Image resizer support : $enable_image_resizer
1015 Link prefetch support : $enable_link_prefetch 1286 Link prefetch support : $enable_link_prefetch
1016 Opcode stats : $enable_opcode_stats 1287 Opcode stats : $enable_opcode_stats
1017 SharedWorkers support : $enable_shared_workers 1288 SharedWorkers support : $enable_shared_workers
1289 Color input support : $enable_input_color
1018 Speech input support : $enable_input_speech 1290 Speech input support : $enable_input_speech
1019 SVG support : $enable_svg 1291 SVG support : $enable_svg
1020 SVG animation support : $enable_svg_animation 1292 SVG animation support : $enable_svg_animation
@@ -1022,19 +1294,26 @@ Features:
1022 SVG foreign object support : $enable_svg_foreign_object 1294 SVG foreign object support : $enable_svg_foreign_object
1023 SVG as image support : $enable_svg_as_image 1295 SVG as image support : $enable_svg_as_image
1024 SVG use element support : $enable_svg_use 1296 SVG use element support : $enable_svg_use
1025 WML support : $enable_wml 1297 WCSS support : $enable_wcss
1298 Web Audio support : $enable_web_audio
1026 Web Sockets support : $enable_web_sockets 1299 Web Sockets support : $enable_web_sockets
1027 Web Timing support : $enable_web_timing 1300 Web Timing support : $enable_web_timing
1028 Web Workers support : $enable_workers 1301 Web Workers support : $enable_workers
1029 XHTML-MP support : $enable_xhtmlmp 1302 XHTML-MP support : $enable_xhtmlmp
1030 XPATH support : $enable_xpath 1303 XPATH support : $enable_xpath
1031 XSLT support : $enable_xslt 1304 XSLT support : $enable_xslt
1305 Spellcheck support : $enable_spellcheck
1306 Animation API : $enable_animation_api
1307 Touch Icon Loading support : $enable_touch_icon_loading
1308 Register Protocol Handler support : $enable_register_protocol_handler
1032 1309
1033GTK+ configuration: 1310GTK+ configuration:
1034 GTK+ version : $with_gtk 1311 GTK+ version : $with_gtk
1035 GDK target : $with_target 1312 GDK target : $with_target
1036 Hildon UI extensions : $with_hildon 1313 Hildon UI extensions : $with_hildon
1037 Introspection support : $enable_introspection 1314 Introspection support : $enable_introspection
1315 WebKit2 support : $enable_webkit2
1316 WebKit2 plugin process : $enable_plugin_process
1038" 1317"
1039if test "$with_unicode_backend" = "glib"; then 1318if test "$with_unicode_backend" = "glib"; then
1040 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<" 1319 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
diff --git a/meta/recipes-sato/webkit/files/update-webkit.sh b/meta/recipes-sato/webkit/files/update-webkit.sh
new file mode 100755
index 0000000..723c45a
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/update-webkit.sh
@@ -0,0 +1,8 @@
1#!/bin/sh
2# usage: sh update-webkit.sh <revision>
3
4export rev=$1
5
6for i in autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared ; do
7 wget "http://trac.webkit.org/browser/trunk/$i?rev=$rev&format=raw" -O $i
8done
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index af43ae8..5eb9b2e 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -3,27 +3,23 @@ HOMEPAGE = "http://www.webkitgtk.org/"
3BUGTRACKER = "http://bugs.webkit.org/" 3BUGTRACKER = "http://bugs.webkit.org/"
4 4
5LICENSE = "BSD & LGPLv2+" 5LICENSE = "BSD & LGPLv2+"
6LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ 6LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
7 file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" 8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
9 9
10DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3" 10DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" 11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
12 12
13SRCREV_FORMAT = "webcore-rwebkit" 13SRCREV_FORMAT = "source"
14 14
15SRCREV = "72836" 15SRCREV = "90727"
16PV = "1.3.7+svnr${SRCPV}" 16PV = "1.5.1+svnr${SRCPV}"
17PR = "r2" 17PR = "r0"
18 18
19SRC_URI = "\ 19SRC_URI = "\
20 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ 20 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
21 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
22 svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
23 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
24 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ 21 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
25 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ 22 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http \
26 svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
27 file://Makefile \ 23 file://Makefile \
28 file://Makefile.shared \ 24 file://Makefile.shared \
29 file://autogen.sh \ 25 file://autogen.sh \
@@ -41,36 +37,29 @@ EXTRA_OECONF = "\
41 --enable-debug=no \ 37 --enable-debug=no \
42 --enable-svg \ 38 --enable-svg \
43 --enable-icon-database=yes \ 39 --enable-icon-database=yes \
44 --disable-fast-malloc \ 40 --enable-fullscreen-api \
41 --enable-image-resizer \
42 --enable-link-prefetch \
43 UNICODE_CFLAGS=-D_REENTRANT \
45 " 44 "
46 45
47EXTRA_AUTORECONF = " -I autotools " 46EXTRA_AUTORECONF = " -I Source/autotools "
48 47
49do_compile_prepend() { 48do_configure_append() {
50 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ 49 # somethings wrong with icu, fix it up manually
51 mkdir -p ${S}/Programs/ 50 for makefile in $(find ${S} -name "GNUmakefile") ; do
52 cd ${S}/JavaScriptCore/pcre 51 sed -i s:-I/usr/include::g $makefile
53 if test -e dftables.c 52 done
54 then
55 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
56 elif test -e dftables.cpp
57 then
58 ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
59 fi
60 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
61 cp dftables ${S}/Programs/
62 cd ${S}
63} 53}
64 54
65do_install_prepend() { 55do_install_prepend() {
66 cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true 56 cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
67} 57}
68 58
69
70PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" 59PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
71FILES_${PN}launcher = "${bindir}/GtkLauncher" 60FILES_${PN}launcher = "${bindir}/GtkLauncher"
72FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" 61FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
73FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" 62FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
74FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" 63FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
75FILES_${PN} += "${datadir}/webkit-*/resources/error.html \ 64FILES_${PN} += "${datadir}/webkit-*/resources/error.html \
76 ${datadir}/webkitgtk-*/images \ 65 ${datadir}/webkitgtk-*/images \