summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-07-22 19:30:47 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-24 00:07:19 +0100
commit3a1c4561721ac0be9bb0cb1fca5f5d41d18a085c (patch)
treea061a9fec5649ccca315380361bfaa02abcbc12c
parentb0b3468b956ae478cc8c79f972bdbcce38bb3893 (diff)
downloadpoky-3a1c4561721ac0be9bb0cb1fca5f5d41d18a085c.tar.gz
webkit-gtk: Update to 1.3.2
* Update the following files with 1.3.2 version in upstream: GNUmakefile.am Makefile Makefile.shared autogen.sh configure.ac * Update the .bb with the one in openembeded(91eefa1e) * inherit pkgconfig and remove dolt stuff according to RP's comments Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/packages/webkit/files/GNUmakefile.am883
-rw-r--r--meta/packages/webkit/files/Makefile14
-rw-r--r--meta/packages/webkit/files/Makefile.shared9
-rwxr-xr-xmeta/packages/webkit/files/autogen.sh12
-rw-r--r--meta/packages/webkit/files/configure.ac913
-rw-r--r--meta/packages/webkit/files/gtk-doc.make173
-rw-r--r--meta/packages/webkit/webkit-gtk_svn.bb20
8 files changed, 1541 insertions, 485 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 67a1032f84..d3d59274aa 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -119,7 +119,7 @@ SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
119SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb" 119SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
120SRCREV_pn-settings-daemon ??= "2059" 120SRCREV_pn-settings-daemon ??= "2059"
121SRCREV_pn-ubootchart ??= "10" 121SRCREV_pn-ubootchart ??= "10"
122SRCREV_pn-webkit-gtk ??= "31859" 122SRCREV_pn-webkit-gtk ??= "62027"
123SRCREV_pn-web-webkit ??= "110" 123SRCREV_pn-web-webkit ??= "110"
124SRCREV_pn-web ??= "97" 124SRCREV_pn-web ??= "97"
125SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" 125SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am
index a0aefbf50b..39817f1dd5 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/packages/webkit/files/GNUmakefile.am
@@ -5,7 +5,6 @@
5# _h_api = API headers that will be installed and included in the distribution 5# _h_api = API headers that will be installed and included in the distribution
6# _cppflags = flags that will be passed to the C/CXX Preprocessor 6# _cppflags = flags that will be passed to the C/CXX Preprocessor
7# _sources = sources that will be compiled and included in the distribution 7# _sources = sources that will be compiled and included in the distribution
8# _headers = header files that will be part of the distribution
9# _built_sources = files that will be autogenerated by the build system and 8# _built_sources = files that will be autogenerated by the build system and
10# will be part of the _SOURCES primary 9# will be part of the _SOURCES primary
11# _built_nosources = files that are autogenerated but are not part of the 10# _built_nosources = files that are autogenerated but are not part of the
@@ -14,8 +13,9 @@
14# 13#
15# Sources, headers, flags, etc... should be added to the respective variables 14# Sources, headers, flags, etc... should be added to the respective variables
16# with the above suffix, e.g, webcore-specific sources should go to 15# with the above suffix, e.g, webcore-specific sources should go to
17# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags, 16# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
18# etc... The only exceptions are the global variables. See Global Variables below. 17# etc... The only exceptions are the global variables. See Global Variables
18# below.
19# 19#
20# Global Variables 20# Global Variables
21# 21#
@@ -29,223 +29,290 @@
29srcdir = @srcdir@ 29srcdir = @srcdir@
30VPATH = @srcdir@ 30VPATH = @srcdir@
31 31
32DISTCHECK_CONFIGURE_FLAGS = \
33 --enable-introspection \
34 --enable-gtk-doc
35
32# Directory for autogenerated sources 36# Directory for autogenerated sources
33GENSOURCES := $(top_builddir)/DerivedSources 37GENSOURCES := $(top_builddir)/DerivedSources
38GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit
39GENPROGRAMS := $(top_builddir)/Programs
34 40
35# Script for creating hash tables 41# Script for creating hash tables
36CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table 42CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
37
38# Libraries and support components
39noinst_HEADERS :=
40 43
41noinst_PROGRAMS := 44# Script for creating regexp tables
45CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
42 46
43lib_LIBRARIES := 47# Programs to run the WebKitGtk unit tests
48GTESTER = gtester
49GTESTER_REPORT = gtester-report
44 50
51# Libraries and support components
52bin_PROGRAMS :=
53noinst_PROGRAMS :=
54noinst_HEADERS :=
55noinst_LTLIBRARIES :=
56lib_LTLIBRARIES :=
45IDL_BINDINGS := 57IDL_BINDINGS :=
46 58TEST_PROGS :=
47# Files that will be distributed 59POFILES :=
60MOFILES :=
61javascriptcore_h_api :=
62javascriptcore_cppflags:=
63javascriptcore_sources :=
64javascriptcore_built_sources :=
65javascriptcore_built_nosources :=
66javascriptcore_dist :=
67webcore_cppflags :=
68webcore_sources :=
69webcore_libadd :=
70webcore_built_sources :=
71webcore_built_nosources :=
72webcore_dist :=
73webcoregtk_cppflags :=
74webcoregtk_sources :=
75IDL_BINDINGS_GDOM :=
76GDOM_AUTO_CLASSES :=
77GDOM_FIXED_CLASSES :=
78GDOM_CLASSES :=
79GDOM_HEADERS_BUILT :=
80GDOM_HEADERS_FIXED :=
81libgdom_h_api :=
82libgdom_cleanfiles :=
83webkitgtk_h_api :=
84webkitgtk_sources :=
85webkitgtk_cppflags :=
86webkitgtk_built_sources :=
87webkitgtk_built_nosources :=
88webkitgtk_cleanfiles :=
89global_cppflags :=
90global_cflags :=
91global_cxxflags :=
92corekit_cflags :=
93corekit_cppflags :=
94JSCORE_GIRSOURCES :=
95WEBKIT_GIRSOURCES :=
96typelibsdir :=
97typelibs_DATA :=
48EXTRA_DIST := 98EXTRA_DIST :=
99BUILT_SOURCES :=
100CLEANFILES :=
101DISTCLEANFILES :=
102MAINTAINERCLEANFILES :=
103
104webcoregtk_cppflags += \
105 -I$(top_builddir)/DerivedSources/webkit \
106 -I$(srcdir)/WebCore/bindings \
107 -I$(srcdir)/WebCore/bindings/gobject
49 108
109# CFLAGS/CXXFLAGS used by WebCore and WebKit
50# 110#
51# Global flags to CPP 111# gtk+.pc already include glib, cairo, freetype and pango CFLAGS
52global_cppflags := 112# Don't include them for now to reduce the noise when compiling
113# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS)
114corekit_cflags += \
115 -fno-strict-aliasing \
116 $(COVERAGE_CFLAGS) \
117 $(ENCHANT_CFLAGS) \
118 $(GAIL_CFLAGS) \
119 $(GEOCLUE_CFLAGS) \
120 $(GLIB_CFLAGS) \
121 $(GSTREAMER_CFLAGS) \
122 $(GTK_CFLAGS) \
123 $(HILDON_CFLAGS) \
124 $(LIBSOUP_CFLAGS) \
125 $(LIBXML_CFLAGS) \
126 $(LIBXSLT_CFLAGS) \
127 $(SQLITE3_CFLAGS) \
128 $(UNICODE_CFLAGS) \
129 $(XT_CFLAGS)
53 130
54global_cppflags += \ 131# When building webcore/webkit, we want WebCore/config.h and NOT
55 -DWTF_USE_ICU_UNICODE=1 132# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first
133# before JavaScriptCore in the include path.
134corekit_cppflags += \
135 $(global_cppflags) \
136 $(webcore_cppflags) \
137 $(webcoregtk_cppflags) \
138 $(javascriptcore_cppflags)
139
140# For the Gtk port we want to use XP_UNIX both in X11 and Mac
141if !TARGET_WIN32
142corekit_cppflags += -DXP_UNIX
143endif
56 144
57# Default compiler flags 145# Default compiler flags
58global_cflags := \ 146global_cflags += \
59 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ 147 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
60 -Wformat -Wformat-security -Wno-format-y2k -Wundef \ 148 -Wformat -Wformat-security -Wno-format-y2k -Wundef \
61 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ 149 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
62 -Wno-unused-parameter 150 -Wno-unused-parameter -Wno-parentheses \
63 151 -fno-exceptions
64global_cxxflags := \
65 $(SYMBOL_VISIBILITY_INLINES)
66
67if !ENABLE_DEBUG
68global_cflags += \
69 -fno-exceptions \
70 $(SYMBOL_VISIBILITY)
71 152
72global_cxxflags += \ 153global_cxxflags += \
154 $(global_cflags) \
155 $(SYMBOL_VISIBILITY_INLINES) \
73 -fno-rtti 156 -fno-rtti
157
158# -no-undefined required for building DLLs on Windows
159# It breaks the build on other platforms, so we use it conditionally
160if OS_WIN32
161no_undefined = -no-undefined
162version_script = -export-symbols-regex "^(webkit_|JS).*"
163endif
164
165if OS_GNU
166version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
74endif 167endif
75 168
76# Shared libraries 169# Shared libraries
77lib_LTLIBRARIES = \ 170lib_LTLIBRARIES += \
78 libwebkit-1.0.la 171 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
79 172
80# Convenience libraries 173# Convenience libraries
81noinst_LTLIBRARIES = \ 174noinst_LTLIBRARIES += \
82 libJavaScriptCore.la \ 175 libJavaScriptCore.la
83 libWebCore.la
84 176
85#
86# JavaScriptCore 177# JavaScriptCore
87javascriptcore_h_api :=
88javascriptcore_cppflags:=
89javascriptcore_sources :=
90javascriptcore_built_sources :=
91javascriptcore_built_nosources :=
92
93javascriptcore_cppflags += \ 178javascriptcore_cppflags += \
94 -I$(srcdir)/JavaScriptCore \
95 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ 179 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
180 -I$(srcdir)/JavaScriptCore/parser \
96 -I$(srcdir)/JavaScriptCore/wtf \ 181 -I$(srcdir)/JavaScriptCore/wtf \
97 -I$(srcdir)/JavaScriptCore/kjs \ 182 -I$(srcdir)/JavaScriptCore/wtf/gtk \
183 -I$(srcdir)/JavaScriptCore/wtf/gobject \
98 -I$(top_builddir)/DerivedSources 184 -I$(top_builddir)/DerivedSources
99 185
100# The variables above are already included below so no need to touch 186nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
101# these variables unless you really have to 187 $(javascriptcore_built_nosources)
102libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore 188
189nodist_libJavaScriptCore_la_SOURCES = \
190 $(javascriptcore_built_sources)
191
192libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
103libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) 193libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
104 194
105libJavaScriptCore_la_SOURCES = \ 195libJavaScriptCore_la_SOURCES = \
106 $(javascriptcore_built_sources) \
107 $(javascriptcore_sources) 196 $(javascriptcore_sources)
108 197
109libJavaScriptCore_la_LIBADD = \ 198libJavaScriptCore_la_LIBADD = \
110 $(UNICODE_LIBS) \ 199 $(UNICODE_LIBS) \
111 $(GLOBALDEPS_LIBS) \ 200 $(GLIB_LIBS) \
112 -lpthread 201 -lpthread
113 202
114libJavaScriptCore_la_CXXFLAGS = \ 203libJavaScriptCore_la_CXXFLAGS = \
115 $(global_cxxflags) \ 204 $(global_cxxflags) \
116 $(global_cflags) \ 205 $(libJavaScriptCore_la_CFLAGS)
117 $(GLOBALDEPS_CFLAGS) \
118 $(UNICODE_CFLAGS) \
119 -fno-strict-aliasing
120 206
121libJavaScriptCore_la_CFLAGS = \ 207libJavaScriptCore_la_CFLAGS = \
208 -fstrict-aliasing \
209 -O3 \
122 $(global_cflags) \ 210 $(global_cflags) \
123 $(GLOBALDEPS_CFLAGS) \ 211 $(GLIB_CFLAGS) \
124 $(UNICODE_CFLAGS) \ 212 $(UNICODE_CFLAGS)
125 -fno-strict-aliasing
126 213
127libJavaScriptCore_la_CPPFLAGS = \ 214libJavaScriptCore_la_CPPFLAGS = \
128 $(global_cppflags) \ 215 $(global_cppflags) \
129 $(javascriptcore_cppflags) 216 $(javascriptcore_cppflags)
130 217
131#
132# WebCore
133webcore_cppflags :=
134webcore_sources :=
135webcore_headers :=
136webcore_libadd :=
137webcore_built_sources :=
138webcore_built_nosources :=
139
140webcore_cppflags += $(HILDON_CPPFLAGS)
141
142# WebKit 218# WebKit
143webkitgtk_h_api := 219nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
144webkitgtk_headers := 220 $(webcore_built_nosources)
145webkitgtk_sources :=
146webkitgtk_cppflags :=
147webkitgtk_built_sources :=
148webkitgtk_built_nosources :=
149webkitgtk_cleanfiles :=
150 221
151libWebCore_la_SOURCES = \ 222nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
152 $(webcore_built_sources) \ 223 $(webcore_built_sources) \
153 $(webcore_headers) \ 224 $(webkitgtk_built_sources)
154 $(webcore_sources)
155 225
156libWebCore_la_CXXFLAGS = \ 226libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
157 -fno-strict-aliasing \ 227libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
228 $(webkitgtk_h_api) \
229 WebKit/gtk/webkit/webkitenumtypes.h
230
231libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
232 $(webcore_sources) \
233 $(webcoregtk_sources) \
234 $(webkitgtk_sources)
235
236libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
158 $(global_cxxflags) \ 237 $(global_cxxflags) \
159 $(global_cflags) \ 238 $(corekit_cflags)
160 $(GLOBALDEPS_CFLAGS) \
161 $(UNICODE_CFLAGS) \
162 $(WEBKITDEPS_CFLAGS) \
163 $(LIBCURL_CFLAGS) \
164 $(LIBSOUP_CFLAGS) \
165 $(SQLITE3_CFLAGS) \
166 $(GSTREAMER_CFLAGS) \
167 $(LIBXSLT_CFLAGS) \
168 $(COVERAGE_CFLAGS) \
169 $(HILDON_CFLAGS)
170 239
171libWebCore_la_CFLAGS = \ 240libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
172 -fno-strict-aliasing \
173 $(global_cflags) \ 241 $(global_cflags) \
174 $(GLOBALDEPS_CFLAGS) \ 242 $(corekit_cflags)
175 $(UNICODE_CFLAGS) \
176 $(WEBKITDEPS_CFLAGS) \
177 $(LIBCURL_CFLAGS) \
178 $(LIBSOUP_CFLAGS) \
179 $(SQLITE3_CFLAGS) \
180 $(GSTREAMER_CFLAGS) \
181 $(LIBXSLT_CFLAGS) \
182 $(COVERAGE_CFLAGS) \
183 $(HILDON_CFLAGS)
184 243
185libWebCore_la_CPPFLAGS = \ 244libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
186 $(global_cppflags) \ 245 $(corekit_cppflags) \
187 $(webcore_cppflags) \ 246 $(webkitgtk_cppflags) \
188 $(javascriptcore_cppflags) \ 247 $(HILDON_CPPFLAGS)
189 $(webkitgtk_cppflags)
190 248
191libWebCore_la_LIBADD = \ 249libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
250 -version-info @LIBWEBKITGTK_VERSION@ \
251 $(version_script) \
252 $(no_undefined)
253
254libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
255 -lpthread \
192 libJavaScriptCore.la \ 256 libJavaScriptCore.la \
193 $(webcore_libadd) \ 257 libWebCoreJS.la \
194 $(GLOBALDEPS_LIBS) \ 258 libgdom.la \
195 $(WEBKITDEPS_LIBS) \ 259 $(webcore_ldflags) \
196 $(LIBCURL_LIBS) \ 260 $(CAIRO_LIBS) \
197 $(LIBSOUP_LIBS) \ 261 $(COVERAGE_LDFLAGS) \
198 $(UNICODE_LIBS) \ 262 $(ENCHANT_LIBS) \
199 $(SQLITE3_LIBS) \ 263 $(FREETYPE_LIBS) \
264 $(GAIL_LIBS) \
265 $(GEOCLUE_LIBS) \
266 $(GLIB_LIBS) \
200 $(GSTREAMER_LIBS) \ 267 $(GSTREAMER_LIBS) \
201 $(LIBXSLT_LIBS) \ 268 $(GTK_LIBS) \
202 $(HILDON_LIBS) \ 269 $(HILDON_LIBS) \
203 -lpthread \ 270 $(JPEG_LIBS) \
204 -ljpeg 271 $(LIBSOUP_LIBS) \
205 272 $(LIBXML_LIBS) \
206libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit 273 $(LIBXSLT_LIBS) \
207libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) 274 $(PANGO_LIBS) \
208 275 $(PNG_LIBS) \
209libwebkit_1_0_la_SOURCES = \ 276 $(SQLITE3_LIBS) \
210 $(webkitgtk_built_sources) \ 277 $(UNICODE_LIBS) \
211 $(webkitgtk_headers) \ 278 $(XT_LIBS)
212 $(webkitgtk_sources)
213
214libwebkit_1_0_la_CXXFLAGS = \
215 $(libWebCore_la_CXXFLAGS)
216
217libwebkit_1_0_la_CFLAGS = \
218 $(libWebCore_la_CFLAGS)
219 279
220libwebkit_1_0_la_CPPFLAGS = \ 280libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
221 $(libWebCore_la_CPPFLAGS) 281nodist_libgdom_la_HEADERS = \
282 $(libgdom_h_api)
222 283
223libwebkit_1_0_la_LDFLAGS = \ 284libgdom_cleanfiles += \
224 $(COVERAGE_LDFLAGS) \ 285 $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
225 -version-info @LIBWEBKITGTK_VERSION@ 286 $(top_builddir)/libgdom.la \
226 287 $(top_builddir)/stamp-webkitdomenumtypes.h
227libwebkit_1_0_la_LIBADD = \
228 libWebCore.la
229 288
230# 289#
231# Extra checks and flags 290# Extra checks and flags
232global_cppflags += \ 291global_cppflags += \
292 -DBUILDING_CAIRO__=1 \
233 -DBUILDING_GTK__=1 \ 293 -DBUILDING_GTK__=1 \
234 -DWTF_CHANGES 294 -DWTF_CHANGES
235 295
236if !ENABLE_FAST_MALLOC 296if USE_ICU_UNICODE
237global_cppflags += \ 297global_cppflags += \
238 -DUSE_SYSTEM_MALLOC 298 -DWTF_USE_ICU_UNICODE=1
299endif
300
301if USE_GLIB_UNICODE
302global_cppflags += \
303 -DWTF_USE_GLIB_UNICODE=1
239endif 304endif
240 305
241if TARGET_X11 306if !ENABLE_FAST_MALLOC
242global_cppflags += -DXP_UNIX 307global_cppflags += \
308 -DUSE_SYSTEM_MALLOC
243endif 309endif
244 310
245if !ENABLE_DEBUG 311if !ENABLE_DEBUG
246global_cppflags += -DNDEBUG 312global_cppflags += -DNDEBUG
313global_cflags += $(SYMBOL_VISIBILITY)
247else 314else
248webkitgtk_cppflags += \ 315webcoregtk_cppflags += \
249 -DG_DISABLE_DEPRECATED \ 316 -DG_DISABLE_DEPRECATED \
250 -DGDK_PIXBUF_DISABLE_DEPRECATED \ 317 -DGDK_PIXBUF_DISABLE_DEPRECATED \
251 -DGDK_DISABLE_DEPRECATED \ 318 -DGDK_DISABLE_DEPRECATED \
@@ -257,131 +324,533 @@ webkitgtk_cppflags += \
257# -DGTK_MULTIHEAD_SAFE 324# -DGTK_MULTIHEAD_SAFE
258endif 325endif
259 326
260if !ENABLE_DATABASE
261global_cppflags += -DENABLE_DATABASE=0
262endif
263
264if !ENABLE_ICONDATABASE
265global_cppflags += -DENABLE_ICONDATABASE=0
266endif
267
268if ENABLE_COVERAGE 327if ENABLE_COVERAGE
269global_cppflags += \ 328global_cppflags += \
270 -DGCC_GENERATE_TEST_COVERAGE_FILES \ 329 -DGCC_GENERATE_TEST_COVERAGE_FILES \
271 -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS 330 -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
272endif 331endif
273 332
274if ENABLE_VIDEO
275webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
276endif
277
278webkitgtk_cppflags += \
279-I$(top_builddir)/WebKit/gtk/webkit \
280-DBUILDING_CAIRO__=1 \
281-DBUILD_WEBKIT
282
283webkitgtk_h_api += \ 333webkitgtk_h_api += \
284 WebKit/gtk/webkit/webkit.h \ 334 $(srcdir)/WebKit/gtk/webkit/webkit.h \
285 WebKit/gtk/webkit/webkitdefines.h \ 335 $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
286 WebKit/gtk/webkit/webkitnetworkrequest.h \ 336 $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
287 WebKit/gtk/webkit/webkitwebbackforwardlist.h \ 337 $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
288 WebKit/gtk/webkit/webkitwebframe.h \ 338 $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
289 WebKit/gtk/webkit/webkitwebhistoryitem.h \ 339 $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
290 WebKit/gtk/webkit/webkitwebsettings.h \ 340 $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
291 WebKit/gtk/webkit/webkitwebview.h 341 $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
342 $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
343 $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
344 $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
345 $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
346 $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
347 $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
348 $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
349 $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
350 $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
351 $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
352 $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
353 $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
354 $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
355 $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
356 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
292 357
293webkitgtk_built_sources += \ 358webkitgtk_built_sources += \
294 WebKit/gtk/webkit/webkit-marshal.h \ 359 DerivedSources/webkitenumtypes.cpp \
295 WebKit/gtk/webkit/webkit-marshal.cpp 360 DerivedSources/webkitdomenumtypes.cpp \
361 DerivedSources/webkitmarshal.cpp \
362 DerivedSources/webkitmarshal.h \
363 WebKit/gtk/webkit/webkitenumtypes.h
296 364
297webkitgtk_headers += \ 365webkitgtk_sources += \
298 WebKit/gtk/webkit/webkitprivate.h \ 366 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
299 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 367 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
368 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
300 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ 369 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
370 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
371 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
372 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
301 WebKit/gtk/WebCoreSupport/DragClientGtk.h \ 373 WebKit/gtk/WebCoreSupport/DragClientGtk.h \
374 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
302 WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ 375 WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
376 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
303 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ 377 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
378 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
304 WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ 379 WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
305 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h 380 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
306 381 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
307webkitgtk_sources += \ 382 WebKit/gtk/webkit/webkitapplicationcache.cpp \
383 WebKit/gtk/webkit/webkitdownload.cpp \
384 WebKit/gtk/webkit/webkiterror.cpp \
385 WebKit/gtk/webkit/webkithittestresult.cpp \
308 WebKit/gtk/webkit/webkitnetworkrequest.cpp \ 386 WebKit/gtk/webkit/webkitnetworkrequest.cpp \
387 WebKit/gtk/webkit/webkitnetworkresponse.cpp \
309 WebKit/gtk/webkit/webkitprivate.cpp \ 388 WebKit/gtk/webkit/webkitprivate.cpp \
389 WebKit/gtk/webkit/webkitprivate.h \
390 WebKit/gtk/webkit/webkitsoupauthdialog.c \
391 WebKit/gtk/webkit/webkitversion.cpp \
310 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ 392 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
393 WebKit/gtk/webkit/webkitwebdatasource.cpp \
311 WebKit/gtk/webkit/webkitwebframe.cpp \ 394 WebKit/gtk/webkit/webkitwebframe.cpp \
312 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ 395 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
396 WebKit/gtk/webkit/webkitwebinspector.cpp \
397 WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
398 WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
399 WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
400 WebKit/gtk/webkit/webkitwebresource.cpp \
401 WebKit/gtk/webkit/webkitwebdatabase.cpp \
402 WebKit/gtk/webkit/webkitsecurityorigin.cpp \
313 WebKit/gtk/webkit/webkitwebsettings.cpp \ 403 WebKit/gtk/webkit/webkitwebsettings.cpp \
314 WebKit/gtk/webkit/webkitwebview.cpp \ 404 WebKit/gtk/webkit/webkitwebview.cpp \
315 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 405 WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
316 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ 406 WebKit/gtk/webkit/webkitworkers.cpp
317 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ 407
318 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ 408webkitgtk_cppflags += \
319 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ 409 -DBUILDING_WEBKIT \
320 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ 410 -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
321 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp 411 -DDATA_DIR=\"${datadir}\" \
412 -I$(srcdir)/WebKit/gtk \
413 -I$(srcdir)/WebKit/gtk/WebCoreSupport \
414 -I$(srcdir)/WebKit/gtk/webkit \
415 -I$(top_builddir)/WebKit/gtk \
416 -I$(top_builddir)/WebKit/gtk/webkit \
417 -I$(GENSOURCESWEBKITDOM)
322 418
323webkitgtk_cleanfiles += \ 419webkitgtk_cleanfiles += \
420 $(top_builddir)/stamp-webkitmarshal.cpp \
421 $(top_builddir)/stamp-webkitmarshal.h \
422 $(top_builddir)/stamp-webkitenumtypes.cpp \
423 $(top_builddir)/stamp-webkitenumtypes.h \
324 $(top_builddir)/Programs/GtkLauncher \ 424 $(top_builddir)/Programs/GtkLauncher \
325 $(top_builddir)/WebKit/gtk/webkit-1.0.pc 425 $(top_builddir)/WebKit/gtk/docs/version.xml \
426 $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
427 $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
428 $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
429 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
326 430
327pkgconfigdir = $(libdir)/pkgconfig 431pkgconfigdir = $(libdir)/pkgconfig
328pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc 432pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
433
434if ENABLE_INTROSPECTION
435
436JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
437 cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
438
439JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
440WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
441
442$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
443 $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
444 --include=GObject-2.0 \
445 --include=Gtk-@GTK_API_VERSION@ \
446 --include=JSCore-@WEBKITGTK_API_VERSION@ \
447 --include=Soup-2.4 \
448 --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
449 --libtool="$(LIBTOOL)" \
450 --pkg gobject-2.0 \
451 --pkg gtk+-@GTK_API_VERSION@ \
452 --pkg libsoup-2.4 \
453 --output $@ \
454 --add-include-path $(top_srcdir)/WebKit/gtk \
455 --add-include-path $(builddir) \
456 -I$(top_srcdir)/WebKit/gtk \
457 -I$(top_builddir)/WebKit/gtk \
458 -I$(top_builddir)/DerivedSources \
459 -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
460 -I$(top_srcdir) \
461 $(webkitgtk_h_api) \
462 $(libgdom_h_api)
463
464girdir = $(datadir)/gir-1.0
465gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
466
467typelibsdir += $(libdir)/girepository-1.0
468typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
469
470%.typelib: %.gir $(G_IR_COMPILER)
471 $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
472
473CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
329 474
330WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal 475endif
331WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list 476
477EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
332 478
333stamp_files := \ 479WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
334 stamp-webkit-marshal.cpp \ 480WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
335 stamp-webkit-marshal.h
336 481
337WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp 482$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
338 @true 483 @true
339 484
340WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h 485$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
341 @true 486 @true
342 487
343stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) 488stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
344 echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ 489 $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
345 $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ 490 $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
346 echo timestamp > $(@F) 491 echo timestamp > $(@F)
347 492
348stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST) 493stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
349 $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ 494 $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
350 echo timestamp > $(@F) 495 echo timestamp > $(@F)
351 496
352# END WEBKIT GTK+ 497WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
498 @true
499stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
500 $(AM_V_GEN)glib-mkenums \
501 --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
502 --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
503 --fhead "#include <glib-object.h>\n\n" \
504 --fhead "#include <webkit/webkitdefines.h>\n\n" \
505 --fhead "G_BEGIN_DECLS\n\n" \
506 --ftail "G_END_DECLS\n\n" \
507 --ftail "#endif\n" \
508 --fprod "#include <webkit/@basename@>\n\n" \
509 --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
510 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
511 $(webkitgtk_h_api) | \
512 sed 's,web_kit,webkit,' | \
513 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
514 > xgen-gth \
515 && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
516 && rm -f xgen-gth \
517 && echo timestamp > $(@F)
518
519DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
520 $(AM_V_GEN)glib-mkenums \
521 --fhead "#include <config.h>\n" \
522 --fhead "#include <glib-object.h>\n" \
523 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
524 --fhead "extern \"C\" {\n\n" \
525 --fprod "\n/* enumerations from \"@filename@\" */" \
526 --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
527 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
528 --vtail " { 0, NULL, NULL }\n};\n\n" \
529 --vtail "GType @enum_name@_get_type(void)\n{\n" \
530 --vtail " static GType type = 0;\n\n" \
531 --vtail " if (!type)\n" \
532 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
533 --vtail " return type;\n}\n\n" \
534 --ftail "}\n" \
535 $(webkitgtk_h_api) | \
536 sed 's,web_kit,webkit,' \
537 > xgen-gtc \
538 && cp xgen-gtc $@ \
539 && rm -f xgen-gtc
540
541WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
542 @true
543stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
544 $(AM_V_GEN)glib-mkenums \
545 --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
546 --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
547 --fhead "#include <glib-object.h>\n\n" \
548 --fhead "G_BEGIN_DECLS\n\n" \
549 --ftail "G_END_DECLS\n\n" \
550 --ftail "#endif\n" \
551 --fprod "#include <webkit/@basename@>\n\n" \
552 --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
553 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \
554 $(libgdom_h_api) | \
555 sed 's,web_kit,webkit_dom,' | \
556 sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
557 > xgen-cgth \
558 && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
559 && rm -f xgen-cgth \
560 && echo timestamp > $(@F)
561
562DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
563 $(AM_V_GEN)glib-mkenums \
564 --fhead "#include <config.h>\n" \
565 --fhead "#include <glib-object.h>\n" \
566 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
567 --fhead "extern \"C\" {\n\n" \
568 --fprod "\n/* enumerations from \"@filename@\" */" \
569 --vhead "static const G@Type@Value _@enum_name@_values] = {" \
570 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
571 --vtail " { 0, NULL, NULL }\n};\n\n" \
572 --vtail "GType @enum_name@_get_type(void)\n{\n" \
573 --vtail " static GType type = 0;\n\n" \
574 --vtail " if (!type)\n" \
575 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
576 --vtail " return type;\n}\n\n" \
577 --ftail "}\n" \
578 $(libgdom_h_api) | \
579 sed 's,web_kit,webkitdom,' \
580 > xgen-cgtc \
581 && cp xgen-cgtc $@ \
582 && rm -f xgen-cgtc
353 583
354# Files that will be cleaned 584# Files that will be distributed
355MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) 585EXTRA_DIST += \
356DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) 586 $(srcdir)/gtk-doc.make \
357CLEANFILES := $(stamp_files) $(BUILT_SOURCES) 587 WebKit/LICENSE \
588 $(javascriptcore_dist) \
589 $(webcore_dist) \
590 $(srcdir)/autotools/symbols.filter \
591 $(srcdir)/WebKit/gtk/ChangeLog \
592 $(srcdir)/WebKit/gtk/NEWS \
593 $(srcdir)/WebKit/gtk/webkitmarshal.list \
594 $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
595 $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
596 $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
597 $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
598 $(srcdir)/WebKit/gtk/docs/version.xml.in \
599 $(srcdir)/WebKit/gtk/po/* \
600 $(srcdir)/WebKit/gtk/resources/* \
601 $(srcdir)/WebKit/gtk/tests/resources/* \
602 $(srcdir)/WebKit/gtk/tests/test_utils.h
603
604# extra resource files
605resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
606dist_resources_DATA = \
607 $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
608
609# END WEBKIT GTK+
358 610
359# Include module makefiles 611# Include module makefiles
360include JavaScriptCore/GNUmakefile.am 612include JavaScriptCore/GNUmakefile.am
361include WebCore/GNUmakefile.am 613include WebCore/GNUmakefile.am
362include WebKitTools/GNUmakefile.am 614include WebKitTools/GNUmakefile.am
615include WebKit/gtk/po/GNUmakefile.am
616
617# Build unit tests
618noinst_PROGRAMS += $(TEST_PROGS)
363 619
620webkit_tests_cflags = \
621 -fno-strict-aliasing \
622 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
623 -I$(srcdir)/WebKit/gtk \
624 -I$(top_builddir)/WebKit/gtk \
625 -I$(top_builddir)/DerivedSources \
626 -I$(top_srcdir)/WebCore/bindings \
627 -I$(top_srcdir)/WebCore/bindings/gobject \
628 $(global_cflags) \
629 $(GLIB_CFLAGS) \
630 $(GTK_CFLAGS) \
631 $(LIBSOUP_CFLAGS)
632
633webkit_tests_ldadd = \
634 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
635 $(GTK_LIBS) \
636 $(GLIB_LIBS) \
637 $(LIBSOUP_LIBS)
638
639webkit_tests_ldflags = \
640 -no-install \
641 -no-fast-install
642
643TEST_PROGS += \
644 Programs/unittests/testdomdocument \
645 Programs/unittests/testdomdomwindow \
646 Programs/unittests/testdomnode \
647 Programs/unittests/testhttpbackend \
648 Programs/unittests/testloading \
649 Programs/unittests/testglobals \
650 Programs/unittests/testmimehandling \
651 Programs/unittests/testnetworkrequest \
652 Programs/unittests/testnetworkresponse \
653 Programs/unittests/testwebframe \
654 Programs/unittests/testwebbackforwardlist \
655 Programs/unittests/testwebhistoryitem \
656 Programs/unittests/testwindow \
657 Programs/unittests/testdownload \
658 Programs/unittests/testatk \
659 Programs/unittests/testatkroles \
660 Programs/unittests/testhittestresult \
661 Programs/unittests/testwebsettings \
662 Programs/unittests/testwebresource \
663 Programs/unittests/testwebdatasource \
664 Programs/unittests/testwebview \
665 Programs/unittests/testkeyevents \
666 Programs/unittests/testcopyandpaste
667
668# Add additional tests here
669Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
670Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
671Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
672Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
673
674Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
675Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
676Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
677Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
678
679Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
680Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
681Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
682Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
683
684Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
685Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
686Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
687Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
688
689Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
690Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
691Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
692Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
693
694Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
695Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
696Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
697Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
698
699Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
700Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
701Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
702Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
703
704Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
705Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
706Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
707Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
708
709Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
710Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
711Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
712Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
713
714Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
715Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
716Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
717Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
718
719Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
720Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
721Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
722Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
723
724Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
725Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
726Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
727Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
728
729Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
730Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
731Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
732Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
733
734Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
735Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
736Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
737Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
738
739Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
740Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
741Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
742Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
743
744Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
745Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
746Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
747Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
748
749Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
750Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
751Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
752Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
753
754Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
755Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
756Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
757
758Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
759Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
760Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
761
762Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
763Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
764Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
765Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
766
767Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
768Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
769Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
770
771Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
772Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
773Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
774Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
775
776Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c
777Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags)
778Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
779Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
364 780
365# Autogenerated sources 781# Autogenerated sources
366BUILT_SOURCES = \ 782BUILT_SOURCES += \
367 $(javascriptcore_built_sources) \ 783 $(javascriptcore_built_sources) \
368 $(javascriptcore_built_nosources) \ 784 $(javascriptcore_built_nosources) \
369 $(webcore_built_sources) \ 785 $(webcore_built_sources) \
370 $(webcore_built_nosources) \ 786 $(webcore_built_nosources) \
371 $(webkitgtk_built_sources) \ 787 $(webkitgtk_built_sources) \
372 $(webkitgtk_built_nosources) 788 $(webkitgtk_built_nosources) \
789 $(gdom_built_nosources)
373 790
374# Project-wide clean rules 791# Project-wide clean rules
792# Files that will be cleaned
375CLEANFILES += \ 793CLEANFILES += \
794 $(BUILT_SOURCES) \
376 $(webkitgtk_cleanfiles) \ 795 $(webkitgtk_cleanfiles) \
377 $(top_builddir)/Programs/DumpRenderTree \ 796 $(libgdom_cleanfiles)
378 $(top_builddir)/Programs/testkjs \ 797
379 $(GENSOURCES) 798DISTCLEANFILES += \
799 $(CLEANFILES)
380 800
381MAINTAINERCLEANFILES += \ 801MAINTAINERCLEANFILES += \
802 $(CLEANFILES) \
382 $(srcdir)/aconfig.h.in \ 803 $(srcdir)/aconfig.h.in \
383 configure \ 804 $(srcdir)/autotools/config.* \
384 config.* \ 805 $(srcdir)/autotools/compile \
385 GNUmakefile.in \ 806 $(srcdir)/autotools/depcomp \
386 INSTALL \ 807 $(srcdir)/autotools/install-sh \
387 README 808 $(srcdir)/autotools/missing \
809 $(srcdir)/configure \
810 $(srcdir)/GNUmakefile.in \
811 $(srcdir)/INSTALL \
812 $(srcdir)/README \
813 $(top_builddir)/config.*
814
815# Older automake versions (1.7) place Plo files in a different place so we need
816# to create the output directory manually.
817all-local: stamp-po
818 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
819
820# remove built sources and program directories
821clean-local:
822 -rm -rf $(GENPROGRAMS)
823
824maintainer-clean-local: distclean-local
825
826distclean-local:
827 -rm -rf $(GENSOURCES) $(GENPROGRAMS)
828
829dist-hook:
830 cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/
831
832install-data-local: po-install-data-local
833
834installdirs-data-local: po-installdirs-data-local
835
836uninstall-local: po-uninstall-local
837
838# Run all tests in cwd
839# FIXME: we should run this under xvfb
840test: $(TEST_PROGS)
841 $(GTESTER) --verbose $(TEST_PROGS);
842
843# test-report: run tests in cwd and generate report
844# full-report: run tests in cwd with -m perf and -m slow and generate report
845# perf-report: run tests in cwd with -m perf and generate report
846test-report full-report perf-report: $(TEST_PROGS)
847 @ case $@ in \
848 test-report) test_options="-k";; \
849 full-report) test_options="-k -m=perf";; \
850 perf-report) test_options="-k -m=perf -m=slow";; \
851 esac ; \
852 $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \
853 $(GTESTER_REPORT) test-report.xml > test-report.html ;
854
855.PHONY: test test-report perf-report full-report
856check-local: test
diff --git a/meta/packages/webkit/files/Makefile b/meta/packages/webkit/files/Makefile
index fa7ea02426..1e50d1d358 100644
--- a/meta/packages/webkit/files/Makefile
+++ b/meta/packages/webkit/files/Makefile
@@ -1,4 +1,4 @@
1MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools 1MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
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=$$?; \
@@ -12,18 +12,6 @@ release r deployment dep deploy:
12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
14 14
15universal u:
16 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
17 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
18
1964:
20 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
21 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
22
2364u:
24 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
25 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
26
27clean: 15clean:
28 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 16 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
29 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 17 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/packages/webkit/files/Makefile.shared
index 096d32e948..aa9fa728d6 100644
--- a/meta/packages/webkit/files/Makefile.shared
+++ b/meta/packages/webkit/files/Makefile.shared
@@ -12,15 +12,6 @@ release r deployment dep deploy: force
12 $(SCRIPTS_PATH)/set-webkit-configuration --release 12 $(SCRIPTS_PATH)/set-webkit-configuration --release
13 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) 13 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
14 14
15universal u: force
16 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
17
1864: force
19 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
20
2164u: force
22 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
23
24clean: 15clean:
25 ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) 16 ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
26 17
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/packages/webkit/files/autogen.sh
index a929538d20..97beb209d2 100755
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/packages/webkit/files/autogen.sh
@@ -8,6 +8,11 @@ test -z "$srcdir" && srcdir=.
8ORIGDIR=`pwd` 8ORIGDIR=`pwd`
9cd $srcdir 9cd $srcdir
10 10
11GTKDOCIZE_FLAGS="--copy"
12LIBTOOLIZE_FLAGS="--force --automake"
13ACLOCAL_FLAGS="-I autotools"
14AUTOMAKE_FLAGS="--foreign --add-missing"
15
11DIE=0 16DIE=0
12 17
13(autoconf --version) < /dev/null > /dev/null 2>&1 || { 18(autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,10 +51,11 @@ rm -rf $top_srcdir/autom4te.cache
46 51
47touch README INSTALL 52touch README INSTALL
48 53
49aclocal || exit $? 54gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
50$LIBTOOLIZE --force || exit $? 55aclocal $ACLOCAL_FLAGS || exit $?
56$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
51autoheader || exit $? 57autoheader || exit $?
52automake --foreign --add-missing || exit $? 58automake $AUTOMAKE_FLAGS || exit $?
53autoconf || exit $? 59autoconf || exit $?
54 60
55cd $ORIGDIR || exit 1 61cd $ORIGDIR || exit 1
diff --git a/meta/packages/webkit/files/configure.ac b/meta/packages/webkit/files/configure.ac
index 3ab2baffb8..d4f3e749fc 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/packages/webkit/files/configure.ac
@@ -1,20 +1,50 @@
1AC_INIT([WebKit],[0.1],[http://bugs.webkit.org/])
2
3AC_PREREQ(2.59) 1AC_PREREQ(2.59)
4 2
5AC_CONFIG_HEADERS([aconfig.h]) 3m4_define([webkit_major_version], [1])
4m4_define([webkit_minor_version], [3])
5m4_define([webkit_micro_version], [2])
6
7# This is the version we'll be using as part of our User-Agent string
8# e.g., AppleWebKit/$(webkit_user_agent_version) ...
9#
10# Sourced from WebCore/Configurations/Version.xcconfig
11m4_define([webkit_user_agent_major_version], [531])
12m4_define([webkit_user_agent_minor_version], [2])
13
14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
15
16AC_CONFIG_MACRO_DIR([autotools])
17AC_CONFIG_AUX_DIR([autotools])
18AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
19
20AC_CONFIG_HEADERS([autotoolsconfig.h])
21AC_CANONICAL_HOST
22
23WEBKIT_MAJOR_VERSION=webkit_major_version
24WEBKIT_MINOR_VERSION=webkit_minor_version
25WEBKIT_MICRO_VERSION=webkit_micro_version
26WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version
27WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version
28AC_SUBST(WEBKIT_MAJOR_VERSION)
29AC_SUBST(WEBKIT_MINOR_VERSION)
30AC_SUBST(WEBKIT_MICRO_VERSION)
31AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
32AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
33
6AC_CONFIG_SRCDIR([WebCore/config.h]) 34AC_CONFIG_SRCDIR([WebCore/config.h])
7 35
8# see http://www.gnu.org/software/libtool/manual.html#Versioning 36dnl # Libtool library version, not to confuse with API version
9LIBWEBKITGTK_VERSION=1:0:0 37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
38LIBWEBKITGTK_VERSION=0:0:0
10AC_SUBST([LIBWEBKITGTK_VERSION]) 39AC_SUBST([LIBWEBKITGTK_VERSION])
11 40
12AM_INIT_AUTOMAKE([foreign subdir-objects]) 41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
13 42
14AC_CANONICAL_HOST 43# Use AM_SILENT_RULES if present
44m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
15 45
16# host checking - inspired by the GTK+ configure.in 46# host checking - inspired by the GTK+ configure.in
17# TODO: os_mac, os_bsd 47# TODO: move these to webkit.m4?
18AC_MSG_CHECKING([for native Win32]) 48AC_MSG_CHECKING([for native Win32])
19case "$host" in 49case "$host" in
20 *-*-mingw*) 50 *-*-mingw*)
@@ -38,49 +68,28 @@ case "$host" in
38 ;; 68 ;;
39esac 69esac
40 70
41# If CXXFLAGS and CFLAGS are unset, default to -O2 71case "$host_os" in
42# This is to tell automake not to include '-g' if CXXFLAGS is not set 72 gnu* | linux* | k*bsd*-gnu)
43# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler 73 os_gnu=yes
44if test -z "$CXXFLAGS"; then 74 ;;
45 CXXFLAGS="-O2" 75 *)
46fi 76 os_gnu=no
47if test -z "$CFLAGS"; then 77 ;;
48 CFLAGS="-O2" 78esac
49fi
50 79
51# programs 80# initialize webkit options
81WEBKIT_INIT
52AC_DISABLE_STATIC 82AC_DISABLE_STATIC
53AM_PROG_LIBTOOL 83AC_LIBTOOL_WIN32_DLL
54AC_PROG_INSTALL 84AC_PROG_LIBTOOL
55AM_PROG_CC_STDC
56AC_PROG_CXX
57AM_PROG_CC_C_O
58
59# check for -fvisibility=hidden compiler support (GCC >= 4)
60saved_CFLAGS="$CFLAGS"
61CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
62AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden])
63AC_COMPILE_IFELSE([char foo;],
64 [ AC_MSG_RESULT([yes])
65 SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ],
66 AC_MSG_RESULT([no]))
67CFLAGS="$saved_CFLAGS"
68AC_SUBST(SYMBOL_VISIBILITY)
69AC_SUBST(SYMBOL_VISIBILITY_INLINES)
70
71AC_PATH_PROG(PERL, perl)
72if test -z "$PERL"; then
73 AC_MSG_ERROR([You need 'perl' to compile WebKit])
74fi
75
76AC_PATH_PROG(BISON, bison)
77if test -z "$BISON"; then
78 AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit])
79fi
80 85
81AC_PATH_PROG(FLEX, flex) 86AC_PATH_PROG(FLEX, flex)
82if test -z "$FLEX"; then 87if test -z "$FLEX"; then
83 AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) 88 AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit])
89else
90 FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
91 AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION],
92 AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly]))
84fi 93fi
85 94
86AC_PATH_PROG(GPERF, gperf) 95AC_PATH_PROG(GPERF, gperf)
@@ -88,82 +97,112 @@ if test -z "$GPERF"; then
88 AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) 97 AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
89fi 98fi
90 99
91AC_PATH_PROG(MV, mv)
92if test -z "$MV"; then
93 AC_MSG_ERROR([You need 'mv' to compile WebKit])
94fi
95
96# GTK+ port only
97# Check for glib-genmarshal and glib-mkenums
98AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
99AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
100
101# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
102# doesn't exist)
103AC_LANG_PUSH([C++])
104AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
105AC_LANG_POP([C++])
106
107# C/C++ Language Features
108AC_C_CONST
109AC_C_INLINE
110AC_C_VOLATILE
111
112# C/C++ Headers
113AC_HEADER_STDC
114AC_HEADER_STDBOOL
115
116# pthread (not needed on Windows) 100# pthread (not needed on Windows)
117if test "$os_win32" = "no"; then 101if test "$os_win32" = "no"; then
118AC_CHECK_HEADERS([pthread.h], 102AC_CHECK_HEADERS([pthread.h],
119 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]), 103 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
120 AC_MSG_ERROR([pthread support is required to build WebKit])) 104 AC_MSG_ERROR([pthread support is required to build WebKit]))
121fi 105fi
122 106
123# libjpeg headers 107# check for libjpeg the way Gtk does it.
124AC_CHECK_HEADERS([jpeglib.h]) 108AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
125 109 jpeg_ok=yes, jpeg_ok=no
126# check for pkg-config 110 AC_MSG_ERROR([JPEG library (libjpeg) not found]))
127AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 111if test "$jpeg_ok" = yes; then
128if test "$PKG_CONFIG" = "no"; then 112 AC_MSG_CHECKING([for jpeglib])
129 AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH]) 113 AC_TRY_CPP(
114[#include <stdio.h>
115#undef PACKAGE
116#undef VERSION
117#undef HAVE_STDLIB_H
118#include <jpeglib.h>],
119 jpeg_ok=yes,
120 jpeg_ok=no)
121 AC_MSG_RESULT($jpeg_ok)
122 if test "$jpeg_ok" = yes; then
123 JPEG_LIBS="-ljpeg"
124 # should we check for progressive JPEG like GTK+ as well?
125 else
126 AC_MSG_ERROR([JPEG library (libjpeg) not found])
127 fi
130fi 128fi
131 129AC_SUBST([JPEG_LIBS])
132# determine the Unicode backend 130
133AC_MSG_CHECKING([the Unicode backend to use]) 131# Check for libpng the way Gtk+ does it
134AC_ARG_WITH(unicode_backend, 132for l in libpng libpng14 libpng12; do
135 AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@], 133 AC_MSG_CHECKING(for $l)
136 [Select Unicode backend [default=icu]]), 134 if $PKG_CONFIG --exists $l ; then
137 [],[unicode_backend="icu"]) 135 AC_MSG_RESULT(yes)
138 136 PNG_LIBS=`$PKG_CONFIG --libs $l`
139case "$unicode_backend" in 137 png_ok=yes
140 icu) ;; 138 break
141 *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;; 139 else
142esac 140 AC_MSG_RESULT(no)
143 141 png_ok=no
144AC_MSG_RESULT([$unicode_backend]) 142 fi
145 143done
146if test "$unicode_backend" = "icu"; then 144if test "$png_ok" != yes; then
147 # check for icu-config 145 AC_CHECK_LIB(png, png_read_info,
148 if test "$os_darwin" = "yes"; then 146 [AC_CHECK_HEADER(png.h,
149 UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" 147 png_ok=yes,
150 UNICODE_LIBS="-licucore" 148 png_ok=no)],
151 else 149 AC_MSG_ERROR([PNG library (libpng) not found]), -lz -lm)
152 AC_PATH_PROG(icu_config, icu-config, no) 150 if test "$png_ok" = yes; then
153 if test "$icu_config" = "no"; then 151 AC_MSG_CHECKING([for png_structp in png.h])
154 AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) 152 AC_TRY_COMPILE([#include <png.h>],
155 fi 153 [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
156 154 png_ok=yes,
157 # We don't use --cflags as this gives us a lot of things that we don't 155 png_ok=no)
158 # necessarily want, like debugging and optimization flags 156 AC_MSG_RESULT($png_ok)
159 # See man (1) icu-config for more info. 157 if test "$png_ok" = yes; then
160 UNICODE_CFLAGS=`$icu_config --cppflags` 158 PNG_LIBS='-lpng -lz'
161 UNICODE_LIBS=`$icu_config --ldflags` 159 else
162 fi 160 AC_MSG_ERROR([PNG library (libpng) not found])
161 fi
162 else
163 AC_MSG_ERROR([PNG library (libpng) not found])
164 fi
163fi 165fi
166AC_SUBST([PNG_LIBS])
167
168# determine the GTK+ version to use
169AC_MSG_CHECKING([the GTK+ version to use])
170AC_ARG_WITH([gtk],
171 [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])],
172 [case "$with_gtk" in
173 2.0|3.0) ;;
174 *) AC_MSG_ERROR([invalid GTK+ version specified]) ;;
175 esac],
176 [with_gtk=2.0])
177AC_MSG_RESULT([$with_gtk])
178
179case "$with_gtk" in
180 2.0) GTK_REQUIRED_VERSION=2.10
181 GTK_API_VERSION=2.0
182 WEBKITGTK_API_MAJOR_VERSION=1
183 WEBKITGTK_API_MINOR_VERSION=0
184 WEBKITGTK_API_VERSION=1.0
185 WEBKITGTK_PC_NAME=webkit
186 GAIL_PC_NAME=gail
187 GAIL_REQUIRED_VERSION=1.8
188 ;;
189 3.0) GTK_REQUIRED_VERSION=2.90
190 GTK_API_VERSION=3.0
191 WEBKITGTK_API_MAJOR_VERSION=3
192 WEBKITGTK_API_MINOR_VERSION=0
193 WEBKITGTK_API_VERSION=3.0
194 WEBKITGTK_PC_NAME=webkitgtk
195 GAIL_PC_NAME=gail-3.0
196 GAIL_REQUIRED_VERSION=2.90.4
197 ;;
198esac
164 199
165AC_SUBST([UNICODE_CFLAGS]) 200AC_SUBST([WEBKITGTK_API_MAJOR_VERSION])
166AC_SUBST([UNICODE_LIBS]) 201AC_SUBST([WEBKITGTK_API_MINOR_VERSION])
202AC_SUBST([WEBKITGTK_API_VERSION])
203AC_SUBST([WEBKITGTK_PC_NAME])
204AC_SUBST([GTK_API_VERSION])
205AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"])
167 206
168# determine the GDK/GTK+ target 207# determine the GDK/GTK+ target
169AC_MSG_CHECKING([the target windowing system]) 208AC_MSG_CHECKING([the target windowing system])
@@ -194,58 +233,88 @@ if test "$with_hildon" = "yes"; then
194 AC_SUBST([HILDON_LIBS]) 233 AC_SUBST([HILDON_LIBS])
195fi 234fi
196 235
197# determine the http backend
198AC_MSG_CHECKING([the HTTP backend to use])
199AC_ARG_WITH(http_backend,
200 AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@],
201 [Select HTTP backend [default=curl]]),
202 [],[with_http_backend="curl"])
203
204case "$with_http_backend" in
205 curl|soup) ;;
206 *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;;
207esac
208
209AC_MSG_RESULT([$with_http_backend])
210
211# minimum base dependencies 236# minimum base dependencies
212CAIRO_REQUIRED_VERSION=1.4 237LIBSOUP_REQUIRED_VERSION=2.28.2
238CAIRO_REQUIRED_VERSION=1.6
213FONTCONFIG_REQUIRED_VERSION=2.4 239FONTCONFIG_REQUIRED_VERSION=2.4
214FREETYPE2_REQUIRED_VERSION=9.0 240FREETYPE2_REQUIRED_VERSION=9.0
215LIBXML_REQUIRED_VERSION=2.6 241LIBXML_REQUIRED_VERSION=2.6
216 242
217# minimum GTK+ base dependencies 243# minimum GTK+ base dependencies
218GLIB_REQUIRED_VERSION=2.0 244PANGO_REQUIRED_VERSION=1.12
219GOBJECT_REQUIRED_VERSION=2.0
220GTHREAD_REQUIRED_VERSION=2.0
221PANGO_REQUIRED_VERSION=1.0
222GTK_REQUIRED_VERSION=2.8
223 245
224# optional modules 246# optional modules
225LIBCURL_REQUIRED_VERSION=7.15
226LIBSOUP_REQUIRED_VERSION=2.4
227LIBXSLT_REQUIRED_VERSION=1.1.7 247LIBXSLT_REQUIRED_VERSION=1.1.7
228SQLITE_REQUIRED_VERSION=3.0 248SQLITE_REQUIRED_VERSION=3.0
229GSTREAMER_REQUIRED_VERSION=0.10 249GSTREAMER_REQUIRED_VERSION=0.10
230GNOME_VFS_REQUIRED_VERSION=2.0 250GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25
231 251ENCHANT_REQUIRED_VERSION=0.22
232PKG_CHECK_MODULES([GLOBALDEPS], 252
233 [glib-2.0 >= $GLIB_REQUIRED_VERSION 253# Available modules
234 gobject-2.0 >= $GOBJECT_REQUIRED_VERSION 254#
235 gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) 255# glib - glib and includes gthread
236AC_SUBST([GLOBALDEPS_CFLAGS]) 256# unicode - check and identify which unicode backend to use
237AC_SUBST([GLOBALDEPS_LIBS]) 257#
238 258# todo: webcore gtk
239PKG_CHECK_MODULES([WEBKITDEPS], 259WEBKIT_CHECK_DEPENDENCIES([glib unicode])
240 [gtk+-2.0 >= $GTK_REQUIRED_VERSION 260
241 pango >= $PANGO_REQUIRED_VERSION 261GETTEXT_PACKAGE=$PACKAGE
242 cairo >= $CAIRO_REQUIRED_VERSION 262AC_SUBST(GETTEXT_PACKAGE)
243 cairo-ft, 263AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
244 fontconfig >= $FONTCONFIG_REQUIRED_VERSION 264 [The gettext catalog name])
245 freetype2 >= $FREETYPE2_REQUIRED_VERSION 265
246 libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) 266PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
247AC_SUBST([WEBKITDEPS_CFLAGS]) 267AC_SUBST(LIBXML_CFLAGS)
248AC_SUBST([WEBKITDEPS_LIBS]) 268AC_SUBST(LIBXML_LIBS)
269
270PKG_CHECK_MODULES(PANGO,
271 [pango >= $PANGO_REQUIRED_VERSION
272 pangoft2])
273AC_SUBST(PANGO_CFLAGS)
274AC_SUBST(PANGO_LIBS)
275
276PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
277AC_SUBST(ENCHANT_CFLAGS)
278AC_SUBST(ENCHANT_LIBS)
279
280PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
281AC_SUBST(GAIL_CFLAGS)
282AC_SUBST(GAIL_LIBS)
283
284# check for target-specific dependencies
285if test "$with_target" = "directfb"; then
286 PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
287 PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION)
288 AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
289else
290 PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
291 PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION)
292
293 if test "$with_target" = "x11" && test "$os_win32" = "no"; then
294 # check for XT
295 PKG_CHECK_MODULES([XT],
296 [xt],
297 [xt_has_pkg_config=yes],
298 [xt_has_pkg_config=no])
299 # some old versions of Xt do not provide xt.pc, so try to link against Xt
300 # and if it's installed fall back to just adding -lXt
301 if test "$xt_has_pkg_config" = "no"; then
302 # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as
303 # we don't care about the XtOpenDisplay symbol but only about the
304 # existence of libXt
305 AC_CHECK_LIB([Xt], [XtOpenDisplay],
306 [XT_CFLAGS=""; XT_LIBS="-lXt"],
307 [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])])
308 fi
309 AC_SUBST([XT_CFLAGS])
310 AC_SUBST([XT_LIBS])
311 AC_DEFINE([WTF_PLATFORM_X11],[1],[Define if target is X11])
312 fi
313fi
314AC_SUBST(GTK_CFLAGS)
315AC_SUBST(GTK_LIBS)
316AC_SUBST(CAIRO_CFLAGS)
317AC_SUBST(CAIRO_LIBS)
249 318
250# check whether to build with debugging enabled 319# check whether to build with debugging enabled
251AC_MSG_CHECKING([whether to do a debug build]) 320AC_MSG_CHECKING([whether to do a debug build])
@@ -255,22 +324,72 @@ AC_ARG_ENABLE(debug,
255 [],[enable_debug="no"]) 324 [],[enable_debug="no"])
256AC_MSG_RESULT([$enable_debug]) 325AC_MSG_RESULT([$enable_debug])
257 326
258# check whether to build with cross-document messaging support 327# check whether to enable optimized builds
259AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) 328AC_MSG_CHECKING([whether to enable optimized builds])
260AC_ARG_ENABLE(cross_document_messaging, 329AC_ARG_ENABLE(optimizations,
261 AC_HELP_STRING([--enable-cross-document-messaging], 330 AC_HELP_STRING([--enable-optimizations],
262 [enable HTML5 cross-document messaging support [default=yes]]), 331 [turn on optimize builds (GCC only)
263 [],[enable_cross_document_messaging="yes"]) 332 [default=yes]]),
264AC_MSG_RESULT([$enable_cross_document_messaging]) 333 [enable_optimizations=$enableval],
334 [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
335AC_MSG_RESULT([$enable_optimizations])
336
337# check whether to enable 3D transforms support
338AC_MSG_CHECKING([whether to enable support for 3D Transforms])
339AC_ARG_ENABLE(3D_transforms,
340 AC_HELP_STRING([--enable-3D-transforms],
341 [enable support for 3D transforms [default=no]]),
342 [],[enable_3D_transforms="no"])
343AC_MSG_RESULT([$enable_3D_transforms])
344
345# check whether to enable channel messaging support
346AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
347AC_ARG_ENABLE(channel_messaging,
348 AC_HELP_STRING([--enable-channel-messaging],
349 [enable HTML5 channel messaging support [default=yes]]),
350 [],[enable_channel_messaging="yes"])
351AC_MSG_RESULT([$enable_channel_messaging])
352
353# check whether to enable JavaScript debugger/profiler support
354AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
355AC_ARG_ENABLE(javascript_debugger,
356 AC_HELP_STRING([--enable-javascript-debugger],
357 [enable JavaScript debugger/profiler support [default=yes]]),
358 [],[enable_javascript_debugger="yes"])
359AC_MSG_RESULT([$enable_javascript_debugger])
360
361# check whether to enable HTML5 Offline Web Applications support
362AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
363AC_ARG_ENABLE(offline_web_applications,
364 AC_HELP_STRING([--enable-offline-web-applications],
365 [enable HTML5 offline web applications support [default=yes]]),
366 [],[enable_offline_web_applications="yes"])
367AC_MSG_RESULT([$enable_offline_web_applications])
265 368
266# check whether to enable HTML5 client-side session and persitent storage support 369# check whether to enable HTML5 client-side session and persitent storage support
267AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) 370AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
268AC_ARG_ENABLE(dom_storage, 371AC_ARG_ENABLE(dom_storage,
269 AC_HELP_STRING([--enable-dom-storage], 372 AC_HELP_STRING([--enable-dom-storage],
270 [enable HTML5 client-side session and persistent storage support [default=no]]), 373 [enable HTML5 client-side session and persistent storage support [default=yes]]),
271 [],[enable_dom_storage="no"]) 374 [],[enable_dom_storage="yes"])
272AC_MSG_RESULT([$enable_dom_storage]) 375AC_MSG_RESULT([$enable_dom_storage])
273 376
377# check whether to enable the indexed database API
378AC_MSG_CHECKING([whether to enable the indexed database API])
379AC_ARG_ENABLE(indexed_database,
380 AC_HELP_STRING([--enable-indexeddb],
381 [enable the indexed database API [default=no]]),
382 [],[enable_indexed_database="no"])
383AC_MSG_RESULT([$enable_indexed_database])
384
385# check whether to enable the speech input API
386AC_MSG_CHECKING([whether to enable the speech input API])
387AC_ARG_ENABLE(input_speech,
388 AC_HELP_STRING([--enable-input-speech],
389 [enable the speech input API [default=no]]),
390 [],[enable_input_speech="no"])
391AC_MSG_RESULT([$enable_input_speech])
392
274# check whether to build with database support 393# check whether to build with database support
275AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) 394AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support])
276AC_ARG_ENABLE(database, 395AC_ARG_ENABLE(database,
@@ -279,22 +398,70 @@ AC_ARG_ENABLE(database,
279 [],[enable_database="yes"]) 398 [],[enable_database="yes"])
280AC_MSG_RESULT([$enable_database]) 399AC_MSG_RESULT([$enable_database])
281 400
401# check whether to build with server-sent events support
402AC_MSG_CHECKING([whether to enable HTML5 server-sent events support])
403AC_ARG_ENABLE(eventsource,
404 AC_HELP_STRING([--enable-eventsource],
405 [enable HTML5 server-sent events support [default=yes]]),
406 [],[enable_eventsource="yes"])
407AC_MSG_RESULT([$enable_eventsource])
408
282# check whether to build with icon database support 409# check whether to build with icon database support
283AC_MSG_CHECKING([whether to enable icon database support]) 410AC_MSG_CHECKING([whether to enable icon database support])
284AC_ARG_ENABLE(icon_database, 411AC_ARG_ENABLE(icon_database,
285 AC_HELP_STRING([--enable-icon-database], 412 AC_HELP_STRING([--enable-icon-database],
286 [enable icon database [default=no]]), 413 [enable icon database [default=yes]]),
287 [],[enable_icon_database="no"]) 414 [],[enable_icon_database="yes"])
288AC_MSG_RESULT([$enable_icon_database]) 415AC_MSG_RESULT([$enable_icon_database])
289 416
417# check whether to build with image resizer API support
418AC_MSG_CHECKING([whether to enable image resizer API support])
419AC_ARG_ENABLE(image_resizer,
420 AC_HELP_STRING([--enable-image-resizer],
421 [enable image resizer [default=no]]),
422 [],[enable_image_resizer="no"])
423AC_MSG_RESULT([$enable_image_resizer])
424
425# check whether to enable HTML5 datalist support
426AC_MSG_CHECKING([whether to enable HTML5 datalist support])
427AC_ARG_ENABLE(datalist,
428 AC_HELP_STRING([--enable-datalist],
429 [enable HTML5 datalist support [default=yes]]),
430 [],[enable_datalist="yes"])
431AC_MSG_RESULT([$enable_datalist])
432
433# check whether to enable HTML5 ruby support
434AC_MSG_CHECKING([whether to enable HTML5 ruby support])
435AC_ARG_ENABLE(ruby,
436 AC_HELP_STRING([--enable-ruby],
437 [enable HTML5 ruby support [default=yes]]),
438 [],[enable_ruby="yes"])
439AC_MSG_RESULT([$enable_ruby])
440
441# check whether to enable HTML5 sandbox iframe support
442AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
443AC_ARG_ENABLE(sandbox,
444 AC_HELP_STRING([--enable-sandbox],
445 [enable HTML5 sandboxed iframe support [default=yes]]),
446 [],[enable_sandbox="yes"])
447AC_MSG_RESULT([$enable_sandbox])
448
290# check whether to enable HTML5 audio/video support 449# check whether to enable HTML5 audio/video support
291AC_MSG_CHECKING([whether to enable HTML5 video support]) 450AC_MSG_CHECKING([whether to enable HTML5 video support])
292AC_ARG_ENABLE(video, 451AC_ARG_ENABLE(video,
293 AC_HELP_STRING([--enable-video], 452 AC_HELP_STRING([--enable-video],
294 [enable HTML5 video support [default=no]]), 453 [enable HTML5 video support [default=yes]]),
295 [],[enable_video="no"]) 454 [],[enable_video="yes"])
296AC_MSG_RESULT([$enable_video]) 455AC_MSG_RESULT([$enable_video])
297 456
457# check whether to enable XHTML-MP support
458AC_MSG_CHECKING([whether to enable XHTML-MP support])
459AC_ARG_ENABLE(xhtmlmp,
460 AC_HELP_STRING([--enable-xhtmlmp],
461 [enable support for XHTML-MP [default=no]]),
462 [],[enable_xhtmlmp="no"])
463AC_MSG_RESULT([$enable_xhtmlmp])
464
298# check whether to enable XPath support 465# check whether to enable XPath support
299AC_MSG_CHECKING([whether to enable XPath support]) 466AC_MSG_CHECKING([whether to enable XPath support])
300AC_ARG_ENABLE(xpath, 467AC_ARG_ENABLE(xpath,
@@ -311,80 +478,171 @@ AC_ARG_ENABLE(xslt,
311 [],[enable_xslt="yes"]) 478 [],[enable_xslt="yes"])
312AC_MSG_RESULT([$enable_xslt]) 479AC_MSG_RESULT([$enable_xslt])
313 480
314# check whether to enable SVG experimental features 481# check whether to enable geolocation support
315# Enable all SVG if it is 482AC_MSG_CHECKING([whether to enable geolocation support])
316AC_MSG_CHECKING([whether to enable SVG experimental features]) 483AC_ARG_ENABLE(geolocation,
317AC_ARG_ENABLE(svg_experimental, 484 AC_HELP_STRING([--enable-geolocation],
318 AC_HELP_STRING([--enable-svg-experimental], 485 [enable support for geolocation [default=no]]),
319 [enable support for SVG experimental features [default=no]]), 486 [],[enable_geolocation="no"])
320 [],[enable_svg_experimental="no"]) 487AC_MSG_RESULT([$enable_geolocation])
321AC_MSG_RESULT([$enable_svg_experimental]) 488
322 489# check whether to enable MathML support
323if test "$enable_svg_experimental" = "yes"; then 490AC_MSG_CHECKING([whether to enable MathML support])
324 enable_svg=yes 491AC_ARG_ENABLE(mathml,
325 enable_svg_animation=yes 492 AC_HELP_STRING([--enable-mathml],
326# enable_svg_filters=yes 493 [enable support for MathML [default=no]]),
327 enable_svg_fonts=yes 494 [],[enable_mathml="no"])
328 enable_svg_foreign_object=yes 495AC_MSG_RESULT([$enable_mathml])
329 enable_svg_as_image=yes
330 enable_svg_use_element=yes
331fi
332 496
333# check whether to enable SVG support 497# check whether to enable SVG support
334AC_MSG_CHECKING([whether to enable SVG support]) 498AC_MSG_CHECKING([whether to enable SVG support])
335AC_ARG_ENABLE(svg, 499AC_ARG_ENABLE(svg,
336 AC_HELP_STRING([--enable-svg], 500 AC_HELP_STRING([--enable-svg],
337 [enable support for SVG [default=no]]), 501 [enable support for SVG [default=yes]]),
338 [],[enable_svg="no"]) 502 [],[enable_svg="yes"])
339AC_MSG_RESULT([$enable_svg]) 503AC_MSG_RESULT([$enable_svg])
340 504
505# check whether to enable WML support
506AC_MSG_CHECKING([whether to enable WML support])
507AC_ARG_ENABLE(wml,
508 AC_HELP_STRING([--enable-wml],
509 [enable support for WML [default=no]]),
510 [],[enable_wml="no"])
511AC_MSG_RESULT([$enable_wml])
512
513# check whether to enable SharedWorkers support
514AC_MSG_CHECKING([whether to enable SharedWorkers support])
515AC_ARG_ENABLE(shared_workers,
516 AC_HELP_STRING([--enable-shared-workers],
517 [enable support for SharedWorkers [default=yes]]),
518 [],[enable_shared_workers="yes"])
519AC_MSG_RESULT([$enable_shared_workers])
520
521# check whether to enable Web Workers support
522AC_MSG_CHECKING([whether to enable Web Workers support])
523AC_ARG_ENABLE(workers,
524 AC_HELP_STRING([--enable-workers],
525 [enable support for Web Workers [default=yes]]),
526 [],[enable_workers="yes"])
527AC_MSG_RESULT([$enable_workers])
528
529# turn off svg features if --disable-svg is requested
530if test "$enable_svg" = "no"; then
531 enable_svg_animation=no
532 enable_svg_fonts=no
533 enable_svg_foreign_object=no
534 enable_svg_as_image=no
535 enable_svg_use=no
536fi
537
341# check whether to enable support for SVG animation 538# check whether to enable support for SVG animation
342AC_MSG_CHECKING([whether to enable support for SVG animation]) 539AC_MSG_CHECKING([whether to enable support for SVG animation])
343AC_ARG_ENABLE(svg_animation, 540AC_ARG_ENABLE(svg_animation,
344 AC_HELP_STRING([--enable-svg-animation], 541 AC_HELP_STRING([--enable-svg-animation],
345 [enable support for SVG animation (experimental) [default=no]]), 542 [enable support for SVG animation (experimental) [default=yes]]),
346 [],[enable_svg_animation="no"]) 543 [],[enable_svg_animation="yes"])
347AC_MSG_RESULT([$enable_svg_animation]) 544AC_MSG_RESULT([$enable_svg_animation])
348 545
349# check whether to enable support for SVG filters 546# check whether to enable support for filters
350AC_MSG_CHECKING([whether to enable support for SVG filters]) 547AC_MSG_CHECKING([whether to enable support for filters])
351AC_ARG_ENABLE(svg_filters, 548AC_ARG_ENABLE(filters,
352 AC_HELP_STRING([--enable-svg-filters], 549 AC_HELP_STRING([--enable-filters],
353 [enable support for SVG filters (experimental) [default=no]]), 550 [enable support for filters (experimental) [default=yes]]),
354 [],[enable_svg_filters="no"]) 551 [],[enable_filters="yes"])
355AC_MSG_RESULT([$enable_svg_filters]) 552AC_MSG_RESULT([$enable_filters])
356 553
357# check whether to enable support for SVG fonts 554# check whether to enable support for SVG fonts
358AC_MSG_CHECKING([whether to enable support for SVG fonts]) 555AC_MSG_CHECKING([whether to enable support for SVG fonts])
359AC_ARG_ENABLE(svg_fonts, 556AC_ARG_ENABLE(svg_fonts,
360 AC_HELP_STRING([--enable-svg-fonts], 557 AC_HELP_STRING([--enable-svg-fonts],
361 [enable support for SVG fonts (experimental) [default=no]]), 558 [enable support for SVG fonts (experimental) [default=yes]]),
362 [],[enable_svg_fonts="no"]) 559 [],[enable_svg_fonts="yes"])
363AC_MSG_RESULT([$enable_svg_fonts]) 560AC_MSG_RESULT([$enable_svg_fonts])
364 561
365# check whether to enable foreign objects support for SVG 562# check whether to enable foreign objects support for SVG
366AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) 563AC_MSG_CHECKING([whether to enable support for SVG foreign objects])
367AC_ARG_ENABLE(svg_foreign_object, 564AC_ARG_ENABLE(svg_foreign_object,
368 AC_HELP_STRING([--enable-svg-foreign-object], 565 AC_HELP_STRING([--enable-svg-foreign-object],
369 [enable support for SVG foreign objects (experimental) [default=no]]), 566 [enable support for SVG foreign objects (experimental) [default=yes]]),
370 [],[enable_svg_foreign_object="no"]) 567 [],[enable_svg_foreign_object="yes"])
371AC_MSG_RESULT([$enable_svg_foreign_object]) 568AC_MSG_RESULT([$enable_svg_foreign_object])
372 569
373# check whether to enable SVG As Image support 570# check whether to enable SVG As Image support
374AC_MSG_CHECKING([whether to enable SVG as Image support]) 571AC_MSG_CHECKING([whether to enable SVG as Image support])
375AC_ARG_ENABLE(svg_as_image, 572AC_ARG_ENABLE(svg_as_image,
376 AC_HELP_STRING([--enable-svg-as-image], 573 AC_HELP_STRING([--enable-svg-as-image],
377 [enable SVG as Image support (experimental) [default=no]]), 574 [enable SVG as Image support (experimental) [default=yes]]),
378 [],[enable_svg_as_image="no"]) 575 [],[enable_svg_as_image="yes"])
379AC_MSG_RESULT([$enable_svg_as_image]) 576AC_MSG_RESULT([$enable_svg_as_image])
380 577
381# check whether to enable SVG USE element support 578# check whether to enable SVG USE element support
382AC_MSG_CHECKING([whether to enable support for SVG use element]) 579AC_MSG_CHECKING([whether to enable support for SVG use element])
383AC_ARG_ENABLE(svg_use_element, 580AC_ARG_ENABLE(svg_use,
384 AC_HELP_STRING([--enable-svg-use-element], 581 AC_HELP_STRING([--enable-svg-use],
385 [enable SVG use element support (experimental) [default=no]]), 582 [enable SVG use element support (experimental) [default=yes]]),
386 [],[enable_svg_use_element="no"]) 583 [],[enable_svg_use="yes"])
387AC_MSG_RESULT([$enable_svg_use_element]) 584AC_MSG_RESULT([$enable_svg_use])
585
586# check for SVG features, enabling SVG if necessary
587if test "$enable_svg_animation" = "yes" || \
588 test "$enable_svg_fonts" = "yes" || \
589 test "$enable_svg_foreign_object" = "yes" || \
590 test "$enable_svg_as_image" = "yes" || \
591 test "$enable_svg_use" = "yes"; then
592 svg_flags=yes
593 if test "$enable_svg" = "no"; then
594 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
595 enable_svg=yes
596 fi
597fi
598
599# check whether to enable Web Socket support
600AC_MSG_CHECKING([whether to enable Web Sockets support])
601AC_ARG_ENABLE(web_sockets,
602 AC_HELP_STRING([--enable-web-sockets],
603 [enable support for Web Sockets [default=no]]),
604 [],[enable_web_sockets="no"])
605AC_MSG_RESULT([$enable_web_sockets])
606
607# check whether to enable Web Timing support
608AC_MSG_CHECKING([whether to enable Web Timing support])
609AC_ARG_ENABLE(web_timing,
610 AC_HELP_STRING([--enable-web-timing],
611 [enable support for Web Timing [default=no]]),
612 [],[enable_web_timing="no"])
613AC_MSG_RESULT([$enable_web_timing])
614
615# check whether to enable Blob.slice support
616AC_MSG_CHECKING([whether to enable Blob.slice support])
617AC_ARG_ENABLE(blob_slice,
618 AC_HELP_STRING([--enable-blob-slice],
619 [enable support for Blob.slice [default=no]]),
620 [],[enable_blob_slice="no"])
621AC_MSG_RESULT([$enable_blob_slice])
622
623# check whether to enable Fast Mobile Scrolling support
624AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
625AC_ARG_ENABLE(fast_mobile_scrolling,
626 AC_HELP_STRING([--enable-fast-mobile-scrolling],
627 [enable support for Fast Mobile Scrolling [default=no]]),
628 [],[enable_fast_mobile_scrolling="no"])
629AC_MSG_RESULT([$enable_fast_mobile_scrolling])
630
631# check whether to enable FileReader support
632AC_MSG_CHECKING([whether to enable FileReader support])
633AC_ARG_ENABLE(file_reader,
634 AC_HELP_STRING([--enable-file-reader],
635 [enable support for FileReader [default=no]]),
636 [],[enable_file_reader="no"])
637AC_MSG_RESULT([$enable_file_reader])
638
639# check whether to enable FileWriter support
640AC_MSG_CHECKING([whether to enable FileWriter support])
641AC_ARG_ENABLE(file_writer,
642 AC_HELP_STRING([--enable-file-writer],
643 [enable support for FileWriter [default=no]]),
644 [],[enable_file_writer="no"])
645AC_MSG_RESULT([$enable_file_writer])
388 646
389# check whether to enable code coverage 647# check whether to enable code coverage
390AC_MSG_CHECKING([whether to enable code coverage support]) 648AC_MSG_CHECKING([whether to enable code coverage support])
@@ -402,6 +660,64 @@ AC_ARG_ENABLE(fast_malloc,
402 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) 660 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
403AC_MSG_RESULT([$enable_fast_malloc]) 661AC_MSG_RESULT([$enable_fast_malloc])
404 662
663AC_MSG_CHECKING([whether to enable JIT compilation])
664AC_ARG_ENABLE([jit],
665 AC_HELP_STRING([--enable-jit],
666 [Enable JIT compilation default=yes]),
667 [],[enable_jit="yes"])
668if test "$enable_jit" = "yes"; then
669 case "$host_cpu" in
670 i*86|x86_64)
671 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
672 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
673 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
674 AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
675 AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
676 AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
677 case "$host_cpu" in
678 i*86)
679 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
680 ;;
681 x86_64)
682 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
683 AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
684 ;;
685 esac
686 ;;
687 *)
688 enable_jit="no (CPU '$host_cpu' not supported)"
689 ;;
690 esac
691fi
692AC_MSG_RESULT([$enable_jit])
693
694# GObject Introspection
695AC_MSG_CHECKING([whether to enable GObject introspection support])
696AC_ARG_ENABLE([introspection],
697 [AS_HELP_STRING([--enable-introspection],[Enable GObject introspection (default: disabled)])],
698 [],[enable_introspection=no])
699AC_MSG_RESULT([$enable_introspection])
700
701G_IR_SCANNER=
702G_IR_COMPILER=
703G_IR_GENERATE=
704GIRDIR=
705GIRTYPELIBDIR=
706
707if test "$enable_introspection" = "yes"; then
708 GOBJECT_INTROSPECTION_REQUIRED=0.6.15
709 PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
710
711 G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
712 G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
713 G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
714 AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support])
715fi
716
717AC_SUBST([G_IR_SCANNER])
718AC_SUBST([G_IR_COMPILER])
719AC_SUBST([G_IR_GENERATE])
720
405# determine the font backend 721# determine the font backend
406AC_MSG_CHECKING([the font backend to use]) 722AC_MSG_CHECKING([the font backend to use])
407AC_ARG_WITH(font_backend, 723AC_ARG_WITH(font_backend,
@@ -419,26 +735,63 @@ AC_MSG_RESULT([$with_font_backend])
419if test "$enable_debug" = "yes"; then 735if test "$enable_debug" = "yes"; then
420 CXXFLAGS="$CXXFLAGS -g" 736 CXXFLAGS="$CXXFLAGS -g"
421 CFLAGS="$CFLAGS -g" 737 CFLAGS="$CFLAGS -g"
738else
739 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
422fi 740fi
423 741
424# check if curl is available 742# Add the appropriate 'O' level for optimized builds
425if test "$with_http_backend" = "curl"; then 743if test "$enable_optimizations" = "yes"; then
426 PKG_CHECK_MODULES([LIBCURL], 744 CXXFLAGS="$CXXFLAGS -O2"
427 [libcurl >= $LIBCURL_REQUIRED_VERSION]) 745 CFLAGS="$CFLAGS -O2"
428 AC_SUBST([LIBCURL_CFLAGS]) 746else
429 AC_SUBST([LIBCURL_LIBS]) 747 CXXFLAGS="$CXXFLAGS -O0"
748 CFLAGS="$CFLAGS -O0"
430fi 749fi
431 750
432if test "$with_http_backend" = "soup"; then 751PKG_CHECK_MODULES([LIBSOUP],
433 PKG_CHECK_MODULES([LIBSOUP], 752 [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
434 [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) 753AC_SUBST([LIBSOUP_CFLAGS])
435 AC_SUBST([LIBSOUP_CFLAGS]) 754AC_SUBST([LIBSOUP_LIBS])
436 AC_SUBST([LIBSOUP_LIBS]) 755
756# check if we can use libSoup 2.29.90 features
757PKG_CHECK_MODULES([LIBSOUP_2_29_90],
758 [libsoup-2.4 >= 2.29.90],
759 [have_libsoup_2_29_90=yes],
760 [have_libsoup_2_29_90=no])
761if test "$have_libsoup_2_29_90" = "yes"; then
762 AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
763fi
764
765# check if FreeType/FontConfig are available
766if test "$with_font_backend" = "freetype"; then
767 if test "$with_target" = "directfb"; then
768 PKG_CHECK_MODULES([FREETYPE],
769 [fontconfig >= $FONTCONFIG_REQUIRED_VERSION
770 freetype2 >= $FREETYPE2_REQUIRED_VERSION])
771 else
772 PKG_CHECK_MODULES([FREETYPE],
773 [cairo-ft
774 fontconfig >= $FONTCONFIG_REQUIRED_VERSION
775 freetype2 >= $FREETYPE2_REQUIRED_VERSION])
776 fi
777 AC_SUBST([FREETYPE_CFLAGS])
778 AC_SUBST([FREETYPE_LIBS])
437fi 779fi
438 780
439# check if sqlite 3 is available 781# check if sqlite 3 is available
440if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then 782if test "$enable_icon_database" = "yes" || \
441 PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) 783 test "$enable_database" = "yes" || \
784 test "$enable_offline_web_applications" = "yes" || \
785 test "$enable_dom_storage" = "yes"; then
786 PKG_CHECK_MODULES([SQLITE3],
787 [sqlite3 >= $SQLITE_REQUIRED_VERSION],
788 [sqlite3_has_pkg_config=yes],
789 [sqlite3_has_pkg_config=no])
790 if test "$sqlite3_has_pkg_config" = "no"; then
791 AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
792 [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
793 [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
794 fi
442 AC_SUBST([SQLITE3_CFLAGS]) 795 AC_SUBST([SQLITE3_CFLAGS])
443 AC_SUBST([SQLITE3_LIBS]) 796 AC_SUBST([SQLITE3_LIBS])
444fi 797fi
@@ -450,13 +803,22 @@ if test "$enable_xslt" = "yes"; then
450 AC_SUBST([LIBXSLT_LIBS]) 803 AC_SUBST([LIBXSLT_LIBS])
451fi 804fi
452 805
806# check if geoclue is available
807if test "$enable_geolocation" = "yes"; then
808 PKG_CHECK_MODULES([GEOCLUE], [geoclue])
809 AC_SUBST([GEOCLUE_CFLAGS])
810 AC_SUBST([GEOCLUE_LIBS])
811fi
812
453# check if gstreamer is available 813# check if gstreamer is available
454if test "$enable_video" = "yes"; then 814if test "$enable_video" = "yes"; then
455 PKG_CHECK_MODULES([GSTREAMER], 815 PKG_CHECK_MODULES([GSTREAMER],
456 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION 816 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
457 gstreamer-base-0.10, 817 gstreamer-app-0.10
458 gstreamer-plugins-base-0.10, 818 gstreamer-base-0.10
459 gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION]) 819 gstreamer-pbutils-0.10
820 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
821 gstreamer-video-0.10])
460 AC_SUBST([GSTREAMER_CFLAGS]) 822 AC_SUBST([GSTREAMER_CFLAGS])
461 AC_SUBST([GSTREAMER_LIBS]) 823 AC_SUBST([GSTREAMER_LIBS])
462fi 824fi
@@ -469,24 +831,18 @@ if test "$enable_coverage" = "yes"; then
469 AC_SUBST([COVERAGE_LDFLAGS]) 831 AC_SUBST([COVERAGE_LDFLAGS])
470fi 832fi
471 833
472# check for SVG features, enabling SVG if necessary 834# check for HTML features
473if test "$enable_svg_animation" = "yes" || \ 835if test "$enable_video" = "yes"; then
474 test "$enable_svg_filters" = "yes" || \ 836 html_flags=yes
475 test "$enable_svg_fonts" = "yes" || \
476 test "$enable_svg_foreign_object" = "yes" || \
477 test "$enable_svg_as_image" = "yes" || \
478 test "$enable_svg_use_element" = "yes"; then
479 svg_flags=yes
480 if test "$enable_svg" = "no"; then
481 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
482 enable_svg=yes
483 fi
484fi 837fi
485 838
839GTK_DOC_CHECK([1.10])
840
486# OS conditionals 841# OS conditionals
487AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) 842AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
488AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"]) 843AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"])
489AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) 844AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
845AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"])
490AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) 846AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
491 847
492# target conditionals 848# target conditionals
@@ -495,9 +851,9 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
495AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) 851AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
496AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) 852AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
497 853
498# HTTP backend conditionals 854# Unicode backend conditionals
499AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"]) 855AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
500AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"]) 856AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
501 857
502# Font backend conditionals 858# Font backend conditionals
503AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) 859AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
@@ -505,30 +861,67 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
505 861
506# WebKit feature conditionals 862# WebKit feature conditionals
507AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) 863AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
508AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) 864AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
865AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"])
866AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
867AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
868AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
509AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) 869AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
510AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) 870AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
871AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
872AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
873AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
511AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 874AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
875AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
876AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
877AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
878AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
512AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) 879AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
513AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) 880AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
881AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
882AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"])
883AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
884AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
885AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
886AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
887AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"])
514AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) 888AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
889AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
890AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
515AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) 891AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
516AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) 892AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
517AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"])
518AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) 893AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
519AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) 894AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
520AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) 895AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
521AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) 896AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
522AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) 897AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
523AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) 898AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
899AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"])
900AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
901AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
524AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) 902AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
903AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
904AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
905AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
906
907# Gtk conditionals
908AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
909
525 910
526AC_CONFIG_FILES([ 911AC_CONFIG_FILES([
527GNUmakefile 912GNUmakefile
528WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in 913WebKit/gtk/webkit/webkitversion.h
914WebKit/gtk/docs/GNUmakefile
915WebKit/gtk/docs/version.xml
529] 916]
530) 917)
531 918
919AC_CONFIG_FILES([
920WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
921WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in]
922,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
923)
924
532AC_OUTPUT 925AC_OUTPUT
533 926
534echo " 927echo "
@@ -536,27 +929,55 @@ WebKit was configured with the following options:
536 929
537Build configuration: 930Build configuration:
538 Enable debugging (slow) : $enable_debug 931 Enable debugging (slow) : $enable_debug
932 Enable GCC build optimization : $enable_optimizations
539 Code coverage support : $enable_coverage 933 Code coverage support : $enable_coverage
540 Unicode backend : $unicode_backend 934 Unicode backend : $with_unicode_backend
541 HTTP backend : $with_http_backend
542 Font backend : $with_font_backend 935 Font backend : $with_font_backend
543 Optimized memory allocator : $enable_fast_malloc 936 Optimized memory allocator : $enable_fast_malloc
544Features: 937Features:
545 HTML5 cross-document messaging : $enable_cross_document_messaging 938 3D Transforms : $enable_3D_transforms
939 Blob.slice support : $enable_blob_slice
940 Fast Mobile Scrolling : $enable_fast_mobile_scrolling
941 JIT compilation : $enable_jit
942 Filters support : $enable_filters
943 FileReader support : $enable_file_reader
944 FileWriter support : $enable_file_writer
945 Geolocation support : $enable_geolocation
946 JavaScript debugger/profiler support : $enable_javascript_debugger
947 MathML support : $enable_mathml
948 HTML5 offline web applications support : $enable_offline_web_applications
949 HTML5 channel messaging support : $enable_channel_messaging
546 HTML5 client-side session and persistent storage support : $enable_dom_storage 950 HTML5 client-side session and persistent storage support : $enable_dom_storage
547 HTML5 client-side database storage support : $enable_database 951 HTML5 client-side database storage support : $enable_database
952 HTML5 ruby support : $enable_ruby
953 HTML5 sandboxed iframe support : $enable_sandbox
954 HTML5 server-sent events support : $enable_eventsource
548 HTML5 video element support : $enable_video 955 HTML5 video element support : $enable_video
549 Icon database support : $enable_icon_database 956 Icon database support : $enable_icon_database
957 Image resizer support : $enable_image_resizer
958 SharedWorkers support : $enable_shared_workers
959 Speech input support : $enable_input_speech
550 SVG support : $enable_svg 960 SVG support : $enable_svg
551 SVG animation support : $enable_svg_animation 961 SVG animation support : $enable_svg_animation
552 SVG filters support : $enable_svg_filters
553 SVG fonts support : $enable_svg_fonts 962 SVG fonts support : $enable_svg_fonts
554 SVG foreign object support : $enable_svg_foreign_object 963 SVG foreign object support : $enable_svg_foreign_object
555 SVG as image support : $enable_svg_as_image 964 SVG as image support : $enable_svg_as_image
556 SVG use element support : $enable_svg_use_element 965 SVG use element support : $enable_svg_use
966 WML support : $enable_wml
967 Web Sockets support : $enable_web_sockets
968 Web Timing support : $enable_web_timing
969 Web Workers support : $enable_workers
970 XHTML-MP support : $enable_xhtmlmp
557 XPATH support : $enable_xpath 971 XPATH support : $enable_xpath
558 XSLT support : $enable_xslt 972 XSLT support : $enable_xslt
559GTK+ configuration: 973GTK+ configuration:
974 GTK+ version : $with_gtk
560 GDK target : $with_target 975 GDK target : $with_target
561 Hildon UI extensions : $with_hildon 976 Hildon UI extensions : $with_hildon
977 Introspection support : $enable_introspection
562" 978"
979if test "$with_unicode_backend" = "glib"; then
980 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
981 echo
982 echo
983fi
diff --git a/meta/packages/webkit/files/gtk-doc.make b/meta/packages/webkit/files/gtk-doc.make
new file mode 100644
index 0000000000..354ffb7c66
--- /dev/null
+++ b/meta/packages/webkit/files/gtk-doc.make
@@ -0,0 +1,173 @@
1# -*- mode: makefile -*-
2
3####################################
4# Everything below here is generic #
5####################################
6
7if GTK_DOC_USE_LIBTOOL
8GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
10else
11GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
12GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
13endif
14
15# We set GPATH here; this gives us semantics for GNU make
16# which are more like other make's VPATH, when it comes to
17# whether a source that is a target of one rule is then
18# searched for in VPATH/GPATH.
19#
20GPATH = $(srcdir)
21
22TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
23
24EXTRA_DIST = \
25 $(content_files) \
26 $(HTML_IMAGES) \
27 $(DOC_MAIN_SGML_FILE) \
28 $(DOC_MODULE)-sections.txt \
29 $(DOC_MODULE)-overrides.txt
30
31DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
32 $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
33
34SCANOBJ_FILES = \
35 $(DOC_MODULE).args \
36 $(DOC_MODULE).hierarchy \
37 $(DOC_MODULE).interfaces \
38 $(DOC_MODULE).prerequisites \
39 $(DOC_MODULE).signals
40
41REPORT_FILES = \
42 $(DOC_MODULE)-undocumented.txt \
43 $(DOC_MODULE)-undeclared.txt \
44 $(DOC_MODULE)-unused.txt
45
46CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
47
48if ENABLE_GTK_DOC
49all-local: html-build.stamp
50else
51all-local:
52endif
53
54docs: html-build.stamp
55
56#### scan ####
57
58scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
59 @echo 'gtk-doc: Scanning header files'
60 @-chmod -R u+w $(srcdir)
61 cd $(srcdir) && \
62 gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
63 if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
64 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
65 else \
66 cd $(srcdir) ; \
67 for i in $(SCANOBJ_FILES) ; do \
68 test -f $$i || touch $$i ; \
69 done \
70 fi
71 touch scan-build.stamp
72
73$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
74 @true
75
76#### templates ####
77
78tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
79 @echo 'gtk-doc: Rebuilding template files'
80 @-chmod -R u+w $(srcdir)
81 cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
82 touch tmpl-build.stamp
83
84tmpl.stamp: tmpl-build.stamp
85 @true
86
87tmpl/*.sgml:
88 @true
89
90
91#### xml ####
92
93sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
94 @echo 'gtk-doc: Building XML'
95 @-chmod -R u+w $(srcdir)
96 cd $(srcdir) && \
97 gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
98 touch sgml-build.stamp
99
100sgml.stamp: sgml-build.stamp
101 @true
102
103#### html ####
104
105html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
106 @echo 'gtk-doc: Building HTML'
107 @-chmod -R u+w $(srcdir)
108 rm -rf $(srcdir)/html
109 mkdir $(srcdir)/html
110 cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
111 test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
112 @echo 'gtk-doc: Fixing cross-references'
113 cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
114 touch html-build.stamp
115
116##############
117
118clean-local:
119 rm -f *~ *.bak
120 rm -rf .libs
121
122distclean-local:
123 cd $(srcdir) && \
124 rm -rf xml $(REPORT_FILES) \
125 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
126
127maintainer-clean-local: clean
128 cd $(srcdir) && rm -rf xml html
129
130install-data-local:
131 -installfiles=`echo $(srcdir)/html/*`; \
132 if test "$$installfiles" = '$(srcdir)/html/*'; \
133 then echo '-- Nothing to install' ; \
134 else \
135 $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
136 for i in $$installfiles; do \
137 echo '-- Installing '$$i ; \
138 $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
139 done; \
140 echo '-- Installing $(srcdir)/html/index.sgml' ; \
141 $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
142 which gtkdoc-rebase >/dev/null && \
143 gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
144 fi
145
146
147uninstall-local:
148 rm -f $(DESTDIR)$(TARGET_DIR)/*
149
150#
151# Require gtk-doc when making dist
152#
153if ENABLE_GTK_DOC
154dist-check-gtkdoc:
155else
156dist-check-gtkdoc:
157 @echo "*** gtk-doc must be installed and enabled in order to make dist"
158 @false
159endif
160
161dist-hook: dist-check-gtkdoc dist-hook-local
162 mkdir $(distdir)/tmpl
163 mkdir $(distdir)/xml
164 mkdir $(distdir)/html
165 -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
166 -cp $(srcdir)/xml/*.xml $(distdir)/xml
167 cp $(srcdir)/html/* $(distdir)/html
168 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
169 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
170 cd $(distdir) && rm -f $(DISTCLEANFILES)
171 -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
172
173.PHONY : dist-hook-local docs
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index 85846f260c..fe31b9c24c 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -3,15 +3,17 @@ 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 \
7 file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
6 9
7DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" 10DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3"
8DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3" 11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3"
9 12
10SRCREV_FORMAT = "webcore-rwebkit" 13SRCREV_FORMAT = "webcore-rwebkit"
11 14
12# Yes, this is wrong... 15PV = "1.3.2+svnr${SRCREV}"
13PV = "0.1+svnr${SRCREV}" 16PR = "r0"
14PR = "r7"
15 17
16SRC_URI = "\ 18SRC_URI = "\
17 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ 19 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -20,16 +22,18 @@ SRC_URI = "\
20 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ 22 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
21 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ 23 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
22 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ 24 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
25 svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
23 file://Makefile \ 26 file://Makefile \
24 file://Makefile.shared \ 27 file://Makefile.shared \
25 file://autogen.sh \ 28 file://autogen.sh \
26 file://configure.ac \ 29 file://configure.ac \
27 file://GNUmakefile.am \ 30 file://GNUmakefile.am \
31 file://gtk-doc.make \
28 " 32 "
29 33
30S = "${WORKDIR}/" 34S = "${WORKDIR}/"
31 35
32inherit autotools pkgconfig 36inherit autotools lib_package pkgconfig
33 37
34EXTRA_OECONF = "\ 38EXTRA_OECONF = "\
35 --enable-debug=no \ 39 --enable-debug=no \
@@ -38,6 +42,8 @@ EXTRA_OECONF = "\
38 --disable-fast-malloc \ 42 --disable-fast-malloc \
39 " 43 "
40 44
45EXTRA_AUTORECONF = " -I autotools "
46
41do_compile_prepend() { 47do_compile_prepend() {
42 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ 48 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
43 mkdir -p ${S}/Programs/ 49 mkdir -p ${S}/Programs/
@@ -54,10 +60,12 @@ do_compile_prepend() {
54 cd ${S} 60 cd ${S}
55} 61}
56 62
57PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore" 63PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
58FILES_${PN}launcher = "${bindir}/GtkLauncher" 64FILES_${PN}launcher = "${bindir}/GtkLauncher"
59FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" 65FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
60FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" 66FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
67FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"
68FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images"
61 69
62 70
63 71
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 00:57:19 +0000