[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.5-2-395-gb7c46dd
Mike Hommey
glandium at debian.org
Wed Apr 29 05:21:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 899201147b575c9738387ab7e7cbf7ec3570904d
Merge: 25d829014b97f3e9b5603839f8c2486a2f1196f7 62bdf96838a4c35051e68dfa20ce2e5442d338d0
Author: Mike Hommey <glandium at debian.org>
Date: Wed Apr 29 07:17:30 2009 +0200
Merge branch 'webkit-1.1' into debian/unstable
diff --combined GNUmakefile.in
index 5716475,7cd6fc5..08bc5cb
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@@ -1,4 -1,4 +1,4 @@@
- # GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am.
+ # GNUmakefile.in generated by automake 1.10.1 from GNUmakefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@@ -112,7 -112,8 +112,8 @@@ noinst_PROGRAMS = Programs/minidom$(EXE
@ENABLE_VIDEO_TRUE at am__append_9 = -lgstinterfaces-0.10 -lgstvideo-0.10
DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
- $(dist_webinspector_DATA) $(dist_webinspectorimages_DATA) \
+ $(dist_resources_DATA) $(dist_webinspector_DATA) \
+ $(dist_webinspectorimages_DATA) \
$(libJavaScriptCore_la_HEADERS) $(libwebkit_1_0_la_HEADERS) \
$(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in \
$(srcdir)/JavaScriptCore/GNUmakefile.am \
@@@ -124,7 -125,9 +125,9 @@@
$(top_srcdir)/WebKit/gtk/webkit/webkitversion.h.in \
$(top_srcdir)/configure ChangeLog INSTALL autotools/compile \
autotools/config.guess autotools/config.sub autotools/depcomp \
- autotools/install-sh autotools/ltmain.sh autotools/missing
+ autotools/install-sh autotools/ltmain.sh autotools/missing \
+ config.guess config.sub install-sh ltmain.sh missing \
+ mkinstalldirs
# Debug build
@ENABLE_DEBUG_TRUE at am__append_10 = \
@@@ -1349,7 -1352,8 +1352,8 @@@ am__vpath_adj = case $$p in
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(webinspectordir)" \
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(resourcesdir)" \
+ "$(DESTDIR)$(webinspectordir)" \
"$(DESTDIR)$(webinspectorimagesdir)" \
"$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(libJavaScriptCore_ladir)" \
@@@ -1475,7 -1479,6 +1479,7 @@@ am__libJavaScriptCore_la_SOURCES_DIST
JavaScriptCore/assembler/AssemblerBuffer.h \
JavaScriptCore/assembler/MacroAssembler.h \
JavaScriptCore/assembler/MacroAssemblerX86.h \
+ JavaScriptCore/assembler/MacroAssemblerX86_64.h \
JavaScriptCore/assembler/MacroAssemblerX86Common.h \
JavaScriptCore/os-win32/stdbool.h \
JavaScriptCore/os-win32/stdint.h JavaScriptCore/pcre/pcre.h \
@@@ -1499,8 -1502,10 +1503,10 @@@
JavaScriptCore/profiler/Profiler.h \
JavaScriptCore/profiler/TreeProfile.cpp \
JavaScriptCore/profiler/TreeProfile.h \
+ JavaScriptCore/interpreter/CachedCall.h \
JavaScriptCore/interpreter/CallFrame.cpp \
JavaScriptCore/interpreter/CallFrame.h \
+ JavaScriptCore/interpreter/CallFrameClosure.h \
JavaScriptCore/runtime/TimeoutChecker.cpp \
JavaScriptCore/runtime/TimeoutChecker.h \
JavaScriptCore/runtime/InitializeThreading.cpp \
@@@ -1577,13 -1582,13 +1583,13 @@@
JavaScriptCore/wtf/ThreadSpecific.h \
JavaScriptCore/wtf/Threading.h \
JavaScriptCore/wtf/Threading.cpp \
- JavaScriptCore/wtf/ThreadingGtk.cpp \
JavaScriptCore/wtf/ThreadingPthreads.cpp \
JavaScriptCore/wtf/TypeTraits.cpp \
JavaScriptCore/wtf/TypeTraits.h \
JavaScriptCore/wtf/UnusedParam.h JavaScriptCore/wtf/Vector.h \
JavaScriptCore/wtf/VectorTraits.h \
JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
+ JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
JavaScriptCore/wtf/unicode/Collator.h \
JavaScriptCore/wtf/unicode/CollatorDefault.cpp \
JavaScriptCore/wtf/unicode/UTF8.cpp \
@@@ -1591,6 -1596,7 +1597,7 @@@
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/wtf/VMTags.h \
JavaScriptCore/yarr/RegexCompiler.h \
JavaScriptCore/yarr/RegexInterpreter.h \
JavaScriptCore/yarr/RegexJIT.h \
@@@ -1889,10 -1895,10 +1896,10 @@@ am__objects_3 = JavaScriptCore/API/libJ
JavaScriptCore/wtf/libJavaScriptCore_la-RandomNumber.lo \
JavaScriptCore/wtf/libJavaScriptCore_la-RefCountedLeakCounter.lo \
JavaScriptCore/wtf/libJavaScriptCore_la-Threading.lo \
JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo \
JavaScriptCore/wtf/libJavaScriptCore_la-TypeTraits.lo \
JavaScriptCore/wtf/gtk/libJavaScriptCore_la-MainThreadGtk.lo \
+ JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo \
JavaScriptCore/wtf/unicode/libJavaScriptCore_la-CollatorDefault.lo \
JavaScriptCore/wtf/unicode/libJavaScriptCore_la-UTF8.lo \
JavaScriptCore/wtf/unicode/icu/libJavaScriptCore_la-CollatorICU.lo \
@@@ -2047,6 -2053,8 +2054,8 @@@ am__libWebCore_la_SOURCES_DIST = WebCor
WebCore/bindings/js/ScriptCallStack.h \
WebCore/bindings/js/ScriptController.cpp \
WebCore/bindings/js/ScriptController.h \
+ WebCore/bindings/js/ScriptEventListener.cpp \
+ WebCore/bindings/js/ScriptEventListener.h \
WebCore/bindings/js/ScriptFunctionCall.cpp \
WebCore/bindings/js/ScriptFunctionCall.h \
WebCore/bindings/js/ScriptInstance.h \
@@@ -2274,6 -2282,8 +2283,8 @@@
WebCore/dom/WebKitTransitionEvent.h WebCore/dom/WheelEvent.cpp \
WebCore/dom/WheelEvent.h WebCore/dom/XMLTokenizer.cpp \
WebCore/dom/XMLTokenizer.h WebCore/dom/XMLTokenizerLibxml2.cpp \
+ WebCore/dom/XMLTokenizerScope.cpp \
+ WebCore/dom/XMLTokenizerScope.h \
WebCore/editing/AppendNodeCommand.cpp \
WebCore/editing/AppendNodeCommand.h \
WebCore/editing/ApplyStyleCommand.cpp \
@@@ -2756,6 -2766,7 +2767,7 @@@
WebCore/platform/SharedBuffer.cpp \
WebCore/platform/SharedBuffer.h WebCore/platform/SharedTimer.h \
WebCore/platform/Sound.h WebCore/platform/StaticConstructors.h \
+ WebCore/platform/SuddenTermination.h \
WebCore/platform/SystemTime.h WebCore/platform/ThemeTypes.h \
WebCore/platform/ThreadCheck.h \
WebCore/platform/ThreadGlobalData.cpp \
@@@ -2987,9 -2998,8 +2999,8 @@@
WebCore/rendering/InlineTextBox.h \
WebCore/rendering/LayoutState.cpp \
WebCore/rendering/LayoutState.h \
- WebCore/rendering/ListMarkerBox.cpp \
- WebCore/rendering/ListMarkerBox.h \
WebCore/rendering/MediaControlElements.h \
+ WebCore/rendering/OverlapTestRequestClient.h \
WebCore/rendering/RenderApplet.cpp \
WebCore/rendering/RenderApplet.h \
WebCore/rendering/RenderArena.cpp \
@@@ -3057,6 -3067,8 +3068,8 @@@
WebCore/rendering/RenderSelectionInfo.h \
WebCore/rendering/RenderSlider.cpp \
WebCore/rendering/RenderSlider.h \
+ WebCore/rendering/RenderSVGModelObject.cpp \
+ WebCore/rendering/RenderSVGModelObject.h \
WebCore/rendering/RenderTable.cpp \
WebCore/rendering/RenderTable.h \
WebCore/rendering/RenderTableCell.cpp \
@@@ -4207,6 -4219,7 +4220,7 @@@ am__objects_17 = WebCore/bindings/js/li
WebCore/bindings/js/libWebCore_la-ScriptCallFrame.lo \
WebCore/bindings/js/libWebCore_la-ScriptCallStack.lo \
WebCore/bindings/js/libWebCore_la-ScriptController.lo \
+ WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo \
WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo \
WebCore/bindings/js/libWebCore_la-ScriptObject.lo \
WebCore/bindings/js/libWebCore_la-ScriptObjectQuarantine.lo \
@@@ -4363,6 -4376,7 +4377,7 @@@
WebCore/dom/libWebCore_la-WheelEvent.lo \
WebCore/dom/libWebCore_la-XMLTokenizer.lo \
WebCore/dom/libWebCore_la-XMLTokenizerLibxml2.lo \
+ WebCore/dom/libWebCore_la-XMLTokenizerScope.lo \
WebCore/editing/libWebCore_la-AppendNodeCommand.lo \
WebCore/editing/libWebCore_la-ApplyStyleCommand.lo \
WebCore/editing/libWebCore_la-BreakBlockquoteCommand.lo \
@@@ -4708,7 -4722,6 +4723,6 @@@
WebCore/rendering/libWebCore_la-InlineFlowBox.lo \
WebCore/rendering/libWebCore_la-InlineTextBox.lo \
WebCore/rendering/libWebCore_la-LayoutState.lo \
- WebCore/rendering/libWebCore_la-ListMarkerBox.lo \
WebCore/rendering/libWebCore_la-RenderApplet.lo \
WebCore/rendering/libWebCore_la-RenderArena.lo \
WebCore/rendering/libWebCore_la-RenderBR.lo \
@@@ -4743,6 -4756,7 +4757,7 @@@
WebCore/rendering/libWebCore_la-RenderScrollbarPart.lo \
WebCore/rendering/libWebCore_la-RenderScrollbarTheme.lo \
WebCore/rendering/libWebCore_la-RenderSlider.lo \
+ WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo \
WebCore/rendering/libWebCore_la-RenderTable.lo \
WebCore/rendering/libWebCore_la-RenderTableCell.lo \
WebCore/rendering/libWebCore_la-RenderTableCol.lo \
@@@ -4901,7 -4915,8 +4916,8 @@@ libWebCore_la_OBJECTS = $(am_libWebCore
libWebCore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libWebCore_la_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- libwebkit_1_0_la_DEPENDENCIES = libWebCore.la $(am__DEPENDENCIES_1)
+ libwebkit_1_0_la_DEPENDENCIES = libWebCore.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am__objects_29 = \
WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-ChromeClientGtk.lo \
WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-ContextMenuClientGtk.lo \
@@@ -4910,6 -4925,8 +4926,8 @@@
WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-FrameLoaderClientGtk.lo \
WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-InspectorClientGtk.lo \
WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.lo \
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo \
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitprivate.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitsoupauthdialog.lo \
@@@ -4921,7 -4938,6 +4939,6 @@@
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebnavigationaction.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebpolicydecision.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebsettings.lo \
- WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo \
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebwindowfeatures.lo
am_libwebkit_1_0_la_OBJECTS = $(am__objects_29)
@@@ -5057,11 -5073,12 +5074,12 @@@ DIST_SOURCES = $(am__TestNetscapePlugin
$(Programs_unittests_testwebbackforwardlist_SOURCES) \
$(Programs_unittests_testwebframe_SOURCES) \
$(Programs_unittests_testwebhistoryitem_SOURCES)
+ dist_resourcesDATA_INSTALL = $(INSTALL_DATA)
dist_webinspectorDATA_INSTALL = $(INSTALL_DATA)
dist_webinspectorimagesDATA_INSTALL = $(INSTALL_DATA)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dist_webinspector_DATA) $(dist_webinspectorimages_DATA) \
- $(pkgconfig_DATA)
+ DATA = $(dist_resources_DATA) $(dist_webinspector_DATA) \
+ $(dist_webinspectorimages_DATA) $(pkgconfig_DATA)
libJavaScriptCore_laHEADERS_INSTALL = $(INSTALL_HEADER)
libwebkit_1_0_laHEADERS_INSTALL = $(INSTALL_HEADER)
am__noinst_HEADERS_DIST = WebCore/css/CSSCharsetRule.idl \
@@@ -5367,6 -5384,8 +5385,8 @@@ ECHO_C = @ECHO_C
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
+ ENCHANT_LIBS = @ENCHANT_LIBS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FLEX = @FLEX@
@@@ -5648,8 -5667,8 +5668,8 @@@ TEST_PROGS := Programs/unittests/testwe
# Gettext stuff
POFILES := $(shell ls $(srcdir)/WebKit/gtk/po/*.po)
- MOFILES := $(shell echo $(POFILES) | sed "s,^$(srcdir)/,,g" | sed \
- 's/\.po/.mo/g')
+ MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed \
+ "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
# Global flags to CPP
@@@ -5812,7 -5831,6 +5832,7 @@@ javascriptcore_sources := JavaScriptCor
JavaScriptCore/assembler/AssemblerBuffer.h \
JavaScriptCore/assembler/MacroAssembler.h \
JavaScriptCore/assembler/MacroAssemblerX86.h \
+ JavaScriptCore/assembler/MacroAssemblerX86_64.h \
JavaScriptCore/assembler/MacroAssemblerX86Common.h \
JavaScriptCore/os-win32/stdbool.h \
JavaScriptCore/os-win32/stdint.h JavaScriptCore/pcre/pcre.h \
@@@ -5836,8 -5854,10 +5856,10 @@@
JavaScriptCore/profiler/Profiler.h \
JavaScriptCore/profiler/TreeProfile.cpp \
JavaScriptCore/profiler/TreeProfile.h \
+ JavaScriptCore/interpreter/CachedCall.h \
JavaScriptCore/interpreter/CallFrame.cpp \
JavaScriptCore/interpreter/CallFrame.h \
+ JavaScriptCore/interpreter/CallFrameClosure.h \
JavaScriptCore/runtime/TimeoutChecker.cpp \
JavaScriptCore/runtime/TimeoutChecker.h \
JavaScriptCore/runtime/InitializeThreading.cpp \
@@@ -5914,13 -5934,13 +5936,13 @@@
JavaScriptCore/wtf/ThreadSpecific.h \
JavaScriptCore/wtf/Threading.h \
JavaScriptCore/wtf/Threading.cpp \
- JavaScriptCore/wtf/ThreadingGtk.cpp \
JavaScriptCore/wtf/ThreadingPthreads.cpp \
JavaScriptCore/wtf/TypeTraits.cpp \
JavaScriptCore/wtf/TypeTraits.h \
JavaScriptCore/wtf/UnusedParam.h JavaScriptCore/wtf/Vector.h \
JavaScriptCore/wtf/VectorTraits.h \
JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
+ JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
JavaScriptCore/wtf/unicode/Collator.h \
JavaScriptCore/wtf/unicode/CollatorDefault.cpp \
JavaScriptCore/wtf/unicode/UTF8.cpp \
@@@ -5928,6 -5948,7 +5950,7 @@@
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/wtf/VMTags.h \
JavaScriptCore/yarr/RegexCompiler.h \
JavaScriptCore/yarr/RegexInterpreter.h \
JavaScriptCore/yarr/RegexJIT.h \
@@@ -6156,6 -6177,8 +6179,8 @@@ webcore_sources := WebCore/WebCorePrefi
WebCore/bindings/js/ScriptCallStack.h \
WebCore/bindings/js/ScriptController.cpp \
WebCore/bindings/js/ScriptController.h \
+ WebCore/bindings/js/ScriptEventListener.cpp \
+ WebCore/bindings/js/ScriptEventListener.h \
WebCore/bindings/js/ScriptFunctionCall.cpp \
WebCore/bindings/js/ScriptFunctionCall.h \
WebCore/bindings/js/ScriptInstance.h \
@@@ -6383,6 -6406,8 +6408,8 @@@
WebCore/dom/WebKitTransitionEvent.h WebCore/dom/WheelEvent.cpp \
WebCore/dom/WheelEvent.h WebCore/dom/XMLTokenizer.cpp \
WebCore/dom/XMLTokenizer.h WebCore/dom/XMLTokenizerLibxml2.cpp \
+ WebCore/dom/XMLTokenizerScope.cpp \
+ WebCore/dom/XMLTokenizerScope.h \
WebCore/editing/AppendNodeCommand.cpp \
WebCore/editing/AppendNodeCommand.h \
WebCore/editing/ApplyStyleCommand.cpp \
@@@ -6865,6 -6890,7 +6892,7 @@@
WebCore/platform/SharedBuffer.cpp \
WebCore/platform/SharedBuffer.h WebCore/platform/SharedTimer.h \
WebCore/platform/Sound.h WebCore/platform/StaticConstructors.h \
+ WebCore/platform/SuddenTermination.h \
WebCore/platform/SystemTime.h WebCore/platform/ThemeTypes.h \
WebCore/platform/ThreadCheck.h \
WebCore/platform/ThreadGlobalData.cpp \
@@@ -7096,9 -7122,8 +7124,8 @@@
WebCore/rendering/InlineTextBox.h \
WebCore/rendering/LayoutState.cpp \
WebCore/rendering/LayoutState.h \
- WebCore/rendering/ListMarkerBox.cpp \
- WebCore/rendering/ListMarkerBox.h \
WebCore/rendering/MediaControlElements.h \
+ WebCore/rendering/OverlapTestRequestClient.h \
WebCore/rendering/RenderApplet.cpp \
WebCore/rendering/RenderApplet.h \
WebCore/rendering/RenderArena.cpp \
@@@ -7166,6 -7191,8 +7193,8 @@@
WebCore/rendering/RenderSelectionInfo.h \
WebCore/rendering/RenderSlider.cpp \
WebCore/rendering/RenderSlider.h \
+ WebCore/rendering/RenderSVGModelObject.cpp \
+ WebCore/rendering/RenderSVGModelObject.h \
WebCore/rendering/RenderTable.cpp \
WebCore/rendering/RenderTable.h \
WebCore/rendering/RenderTableCell.cpp \
@@@ -7455,6 -7482,7 +7484,7 @@@ libWebCore_la_CFLAGS =
$(LIBXSLT_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(HILDON_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(GEOCLUE_CFLAGS)
libWebCore_la_CPPFLAGS = \
@@@ -7491,6 -7519,7 +7521,7 @@@ libWebCore_la_LIBADD =
webkitgtk_h_api := WebKit/gtk/webkit/webkit.h \
WebKit/gtk/webkit/webkitdefines.h \
WebKit/gtk/webkit/webkitdownload.h \
+ WebKit/gtk/webkit/webkiterror.h \
WebKit/gtk/webkit/webkitnetworkrequest.h \
WebKit/gtk/webkit/webkitsoupauthdialog.h \
WebKit/gtk/webkit/webkitversion.h \
@@@ -7517,6 -7546,8 +7548,8 @@@ webkitgtk_sources := WebKit/gtk/WebCore
WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
+ WebKit/gtk/webkit/webkitdownload.cpp \
+ WebKit/gtk/webkit/webkiterror.cpp \
WebKit/gtk/webkit/webkitnetworkrequest.cpp \
WebKit/gtk/webkit/webkitprivate.cpp \
WebKit/gtk/webkit/webkitprivate.h \
@@@ -7529,7 -7560,6 +7562,6 @@@
WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
- WebKit/gtk/webkit/webkitdownload.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
webkitgtk_cppflags := -DBUILDING_WEBKIT -I$(srcdir)/WebKit/gtk \
@@@ -7574,6 -7604,7 +7606,7 @@@ libwebkit_1_0_la_LDFLAGS =
libwebkit_1_0_la_LIBADD = \
libWebCore.la \
+ $(ENCHANT_LIBS) \
$(GNOMEKEYRING_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
@@@ -7585,8 -7616,6 +7618,6 @@@ stamp_files := stamp-webkitmarshal.cpp
WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
- # END WEBKIT GTK+
- #
# Files that will be distributed
EXTRA_DIST = \
WebKit/LICENSE \
@@@ -7601,9 -7630,18 +7632,18 @@@
$(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
$(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
$(srcdir)/WebKit/gtk/docs/version.xml.in \
- $(srcdir)/WebKit/gtk/po/*
+ $(srcdir)/WebKit/gtk/po/* \
+ $(srcdir)/WebKit/gtk/resources/*
+
+
+ # extra resource files
+ resourcesdir = ${datadir}/webkit-1.0/resources
+ dist_resources_DATA = \
+ $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
+ # END WEBKIT GTK+
+
# Files that will be cleaned
MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile \
doltlibtool WebKit/gtk/docs/version.xml \
@@@ -8310,9 -8348,6 +8350,6 @@@ JavaScriptCore/wtf/libJavaScriptCore_la
JavaScriptCore/wtf/libJavaScriptCore_la-Threading.lo: \
JavaScriptCore/wtf/$(am__dirstamp) \
JavaScriptCore/wtf/$(DEPDIR)/$(am__dirstamp)
- JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo: \
- JavaScriptCore/wtf/$(am__dirstamp) \
- JavaScriptCore/wtf/$(DEPDIR)/$(am__dirstamp)
JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo: \
JavaScriptCore/wtf/$(am__dirstamp) \
JavaScriptCore/wtf/$(DEPDIR)/$(am__dirstamp)
@@@ -8328,6 -8363,9 +8365,9 @@@ JavaScriptCore/wtf/gtk/$(DEPDIR)/$(am__
JavaScriptCore/wtf/gtk/libJavaScriptCore_la-MainThreadGtk.lo: \
JavaScriptCore/wtf/gtk/$(am__dirstamp) \
JavaScriptCore/wtf/gtk/$(DEPDIR)/$(am__dirstamp)
+ JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo: \
+ JavaScriptCore/wtf/gtk/$(am__dirstamp) \
+ JavaScriptCore/wtf/gtk/$(DEPDIR)/$(am__dirstamp)
JavaScriptCore/wtf/unicode/$(am__dirstamp):
@$(MKDIR_P) JavaScriptCore/wtf/unicode
@: > JavaScriptCore/wtf/unicode/$(am__dirstamp)
@@@ -8855,6 -8893,9 +8895,9 @@@ WebCore/bindings/js/libWebCore_la-Scrip
WebCore/bindings/js/libWebCore_la-ScriptController.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
+ WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo: \
+ WebCore/bindings/js/$(am__dirstamp) \
+ WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
@@@ -9305,6 -9346,9 +9348,9 @@@ WebCore/dom/libWebCore_la-XMLTokenizer.
WebCore/dom/libWebCore_la-XMLTokenizerLibxml2.lo: \
WebCore/dom/$(am__dirstamp) \
WebCore/dom/$(DEPDIR)/$(am__dirstamp)
+ WebCore/dom/libWebCore_la-XMLTokenizerScope.lo: \
+ WebCore/dom/$(am__dirstamp) \
+ WebCore/dom/$(DEPDIR)/$(am__dirstamp)
WebCore/editing/$(am__dirstamp):
@$(MKDIR_P) WebCore/editing
@: > WebCore/editing/$(am__dirstamp)
@@@ -10423,9 -10467,6 +10469,6 @@@ WebCore/rendering/libWebCore_la-InlineT
WebCore/rendering/libWebCore_la-LayoutState.lo: \
WebCore/rendering/$(am__dirstamp) \
WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
- WebCore/rendering/libWebCore_la-ListMarkerBox.lo: \
- WebCore/rendering/$(am__dirstamp) \
- WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
WebCore/rendering/libWebCore_la-RenderApplet.lo: \
WebCore/rendering/$(am__dirstamp) \
WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
@@@ -10528,6 -10569,9 +10571,9 @@@ WebCore/rendering/libWebCore_la-RenderS
WebCore/rendering/libWebCore_la-RenderSlider.lo: \
WebCore/rendering/$(am__dirstamp) \
WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
+ WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo: \
+ WebCore/rendering/$(am__dirstamp) \
+ WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
WebCore/rendering/libWebCore_la-RenderTable.lo: \
WebCore/rendering/$(am__dirstamp) \
WebCore/rendering/$(DEPDIR)/$(am__dirstamp)
@@@ -12104,6 -12148,12 +12150,12 @@@ WebKit/gtk/webkit/$(am__dirstamp)
WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) WebKit/gtk/webkit/$(DEPDIR)
@: > WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo: \
+ WebKit/gtk/webkit/$(am__dirstamp) \
+ WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo: \
+ WebKit/gtk/webkit/$(am__dirstamp) \
+ WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo: \
WebKit/gtk/webkit/$(am__dirstamp) \
WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
@@@ -12137,9 -12187,6 +12189,6 @@@ WebKit/gtk/webkit/libwebkit_1_0_la-webk
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebsettings.lo: \
WebKit/gtk/webkit/$(am__dirstamp) \
WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
- WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo: \
- WebKit/gtk/webkit/$(am__dirstamp) \
- WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo: \
WebKit/gtk/webkit/$(am__dirstamp) \
WebKit/gtk/webkit/$(DEPDIR)/$(am__dirstamp)
@@@ -12602,6 -12649,8 +12651,8 @@@ mostlyclean-compile
-rm -f JavaScriptCore/wrec/libJavaScriptCore_la-WRECParser.lo
-rm -f JavaScriptCore/wtf/gtk/libJavaScriptCore_la-MainThreadGtk.$(OBJEXT)
-rm -f JavaScriptCore/wtf/gtk/libJavaScriptCore_la-MainThreadGtk.lo
+ -rm -f JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.$(OBJEXT)
+ -rm -f JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-Assertions.$(OBJEXT)
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-Assertions.lo
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-ByteArray.$(OBJEXT)
@@@ -12624,8 -12673,6 +12675,6 @@@
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-TCSystemAlloc.lo
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-Threading.$(OBJEXT)
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-Threading.lo
- -rm -f JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.$(OBJEXT)
- -rm -f JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.$(OBJEXT)
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo
-rm -f JavaScriptCore/wtf/libJavaScriptCore_la-TypeTraits.$(OBJEXT)
@@@ -12850,6 -12897,8 +12899,8 @@@
-rm -f WebCore/bindings/js/libWebCore_la-ScriptController.lo
-rm -f WebCore/bindings/js/libWebCore_la-ScriptControllerGtk.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-ScriptControllerGtk.lo
+ -rm -f WebCore/bindings/js/libWebCore_la-ScriptEventListener.$(OBJEXT)
+ -rm -f WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo
-rm -f WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo
-rm -f WebCore/bindings/js/libWebCore_la-ScriptObject.$(OBJEXT)
@@@ -13170,6 -13219,8 +13221,8 @@@
-rm -f WebCore/dom/libWebCore_la-XMLTokenizer.lo
-rm -f WebCore/dom/libWebCore_la-XMLTokenizerLibxml2.$(OBJEXT)
-rm -f WebCore/dom/libWebCore_la-XMLTokenizerLibxml2.lo
+ -rm -f WebCore/dom/libWebCore_la-XMLTokenizerScope.$(OBJEXT)
+ -rm -f WebCore/dom/libWebCore_la-XMLTokenizerScope.lo
-rm -f WebCore/editing/libWebCore_la-AppendNodeCommand.$(OBJEXT)
-rm -f WebCore/editing/libWebCore_la-AppendNodeCommand.lo
-rm -f WebCore/editing/libWebCore_la-ApplyStyleCommand.$(OBJEXT)
@@@ -14072,8 -14123,6 +14125,6 @@@
-rm -f WebCore/rendering/libWebCore_la-InlineTextBox.lo
-rm -f WebCore/rendering/libWebCore_la-LayoutState.$(OBJEXT)
-rm -f WebCore/rendering/libWebCore_la-LayoutState.lo
- -rm -f WebCore/rendering/libWebCore_la-ListMarkerBox.$(OBJEXT)
- -rm -f WebCore/rendering/libWebCore_la-ListMarkerBox.lo
-rm -f WebCore/rendering/libWebCore_la-MediaControlElements.$(OBJEXT)
-rm -f WebCore/rendering/libWebCore_la-MediaControlElements.lo
-rm -f WebCore/rendering/libWebCore_la-PointerEventsHitRules.$(OBJEXT)
@@@ -14158,6 -14207,8 +14209,8 @@@
-rm -f WebCore/rendering/libWebCore_la-RenderSVGInline.lo
-rm -f WebCore/rendering/libWebCore_la-RenderSVGInlineText.$(OBJEXT)
-rm -f WebCore/rendering/libWebCore_la-RenderSVGInlineText.lo
+ -rm -f WebCore/rendering/libWebCore_la-RenderSVGModelObject.$(OBJEXT)
+ -rm -f WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo
-rm -f WebCore/rendering/libWebCore_la-RenderSVGRoot.$(OBJEXT)
-rm -f WebCore/rendering/libWebCore_la-RenderSVGRoot.lo
-rm -f WebCore/rendering/libWebCore_la-RenderSVGTSpan.$(OBJEXT)
@@@ -14804,6 -14855,8 +14857,8 @@@
-rm -f WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.$(OBJEXT)
-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.$(OBJEXT)
-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo
+ -rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.$(OBJEXT)
+ -rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo
-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.$(OBJEXT)
-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo
-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitprivate.$(OBJEXT)
@@@ -15009,11 -15062,11 +15064,11 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-RefCountedLeakCounter.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-TCSystemAlloc.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-Threading.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingPthreads.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-TypeTraits.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-dtoa.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/gtk/$(DEPDIR)/libJavaScriptCore_la-MainThreadGtk.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/gtk/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/unicode/$(DEPDIR)/libJavaScriptCore_la-CollatorDefault.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/unicode/$(DEPDIR)/libJavaScriptCore_la-UTF8.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at JavaScriptCore/wtf/unicode/icu/$(DEPDIR)/libJavaScriptCore_la-CollatorICU.Plo at am__quote@
@@@ -15123,6 -15176,7 +15178,7 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptCallStack.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptController.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptControllerGtk.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptEventListener.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptFunctionCall.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptObject.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptObjectQuarantine.Plo at am__quote@
@@@ -15283,6 -15337,7 +15339,7 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-WheelEvent.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizer.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizerLibxml2.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizerScope.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/editing/$(DEPDIR)/libWebCore_la-AppendNodeCommand.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/editing/$(DEPDIR)/libWebCore_la-ApplyStyleCommand.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/editing/$(DEPDIR)/libWebCore_la-BreakBlockquoteCommand.Plo at am__quote@
@@@ -15734,7 -15789,6 +15791,6 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-InlineFlowBox.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-InlineTextBox.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-LayoutState.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-ListMarkerBox.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-MediaControlElements.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-PointerEventsHitRules.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderApplet.Plo at am__quote@
@@@ -15777,6 -15831,7 +15833,7 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGImage.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGInline.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGInlineText.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGModelObject.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGRoot.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGTSpan.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGText.Plo at am__quote@
@@@ -16102,6 -16157,7 +16159,7 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkiterror.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitnetworkrequest.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitprivate.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitsoupauthdialog.Plo at am__quote@
@@@ -16826,13 -16882,6 +16884,6 @@@ JavaScriptCore/wtf/libJavaScriptCore_la
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -c -o JavaScriptCore/wtf/libJavaScriptCore_la-Threading.lo `test -f 'JavaScriptCore/wtf/Threading.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/Threading.cpp
- JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo: JavaScriptCore/wtf/ThreadingGtk.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -MT JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo -MD -MP -MF JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Tpo -c -o JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo `test -f 'JavaScriptCore/wtf/ThreadingGtk.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/ThreadingGtk.cpp
- @am__fastdepCXX_TRUE@ mv -f JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Tpo JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='JavaScriptCore/wtf/ThreadingGtk.cpp' object='JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -c -o JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingGtk.lo `test -f 'JavaScriptCore/wtf/ThreadingGtk.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/ThreadingGtk.cpp
-
JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo: JavaScriptCore/wtf/ThreadingPthreads.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -MT JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo -MD -MP -MF JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingPthreads.Tpo -c -o JavaScriptCore/wtf/libJavaScriptCore_la-ThreadingPthreads.lo `test -f 'JavaScriptCore/wtf/ThreadingPthreads.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/ThreadingPthreads.cpp
@am__fastdepCXX_TRUE@ mv -f JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingPthreads.Tpo JavaScriptCore/wtf/$(DEPDIR)/libJavaScriptCore_la-ThreadingPthreads.Plo
@@@ -16854,6 -16903,13 +16905,13 @@@ JavaScriptCore/wtf/gtk/libJavaScriptCor
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -c -o JavaScriptCore/wtf/gtk/libJavaScriptCore_la-MainThreadGtk.lo `test -f 'JavaScriptCore/wtf/gtk/MainThreadGtk.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/gtk/MainThreadGtk.cpp
+ JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo: JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -MT JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo -MD -MP -MF JavaScriptCore/wtf/gtk/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Tpo -c -o JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo `test -f 'JavaScriptCore/wtf/gtk/ThreadingGtk.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+ @am__fastdepCXX_TRUE@ mv -f JavaScriptCore/wtf/gtk/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Tpo JavaScriptCore/wtf/gtk/$(DEPDIR)/libJavaScriptCore_la-ThreadingGtk.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='JavaScriptCore/wtf/gtk/ThreadingGtk.cpp' object='JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -c -o JavaScriptCore/wtf/gtk/libJavaScriptCore_la-ThreadingGtk.lo `test -f 'JavaScriptCore/wtf/gtk/ThreadingGtk.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+
JavaScriptCore/wtf/unicode/libJavaScriptCore_la-CollatorDefault.lo: JavaScriptCore/wtf/unicode/CollatorDefault.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libJavaScriptCore_la_CPPFLAGS) $(CPPFLAGS) $(libJavaScriptCore_la_CXXFLAGS) $(CXXFLAGS) -MT JavaScriptCore/wtf/unicode/libJavaScriptCore_la-CollatorDefault.lo -MD -MP -MF JavaScriptCore/wtf/unicode/$(DEPDIR)/libJavaScriptCore_la-CollatorDefault.Tpo -c -o JavaScriptCore/wtf/unicode/libJavaScriptCore_la-CollatorDefault.lo `test -f 'JavaScriptCore/wtf/unicode/CollatorDefault.cpp' || echo '$(srcdir)/'`JavaScriptCore/wtf/unicode/CollatorDefault.cpp
@am__fastdepCXX_TRUE@ mv -f JavaScriptCore/wtf/unicode/$(DEPDIR)/libJavaScriptCore_la-CollatorDefault.Tpo JavaScriptCore/wtf/unicode/$(DEPDIR)/libJavaScriptCore_la-CollatorDefault.Plo
@@@ -17974,6 -18030,13 +18032,13 @@@ WebCore/bindings/js/libWebCore_la-Scrip
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/bindings/js/libWebCore_la-ScriptController.lo `test -f 'WebCore/bindings/js/ScriptController.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptController.cpp
+ WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo: WebCore/bindings/js/ScriptEventListener.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptEventListener.Tpo -c -o WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo `test -f 'WebCore/bindings/js/ScriptEventListener.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptEventListener.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptEventListener.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptEventListener.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/bindings/js/ScriptEventListener.cpp' object='WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/bindings/js/libWebCore_la-ScriptEventListener.lo `test -f 'WebCore/bindings/js/ScriptEventListener.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptEventListener.cpp
+
WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo: WebCore/bindings/js/ScriptFunctionCall.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptFunctionCall.Tpo -c -o WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo `test -f 'WebCore/bindings/js/ScriptFunctionCall.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptFunctionCall.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptFunctionCall.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptFunctionCall.Plo
@@@ -19066,6 -19129,13 +19131,13 @@@ WebCore/dom/libWebCore_la-XMLTokenizerL
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/dom/libWebCore_la-XMLTokenizerLibxml2.lo `test -f 'WebCore/dom/XMLTokenizerLibxml2.cpp' || echo '$(srcdir)/'`WebCore/dom/XMLTokenizerLibxml2.cpp
+ WebCore/dom/libWebCore_la-XMLTokenizerScope.lo: WebCore/dom/XMLTokenizerScope.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/dom/libWebCore_la-XMLTokenizerScope.lo -MD -MP -MF WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizerScope.Tpo -c -o WebCore/dom/libWebCore_la-XMLTokenizerScope.lo `test -f 'WebCore/dom/XMLTokenizerScope.cpp' || echo '$(srcdir)/'`WebCore/dom/XMLTokenizerScope.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizerScope.Tpo WebCore/dom/$(DEPDIR)/libWebCore_la-XMLTokenizerScope.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/dom/XMLTokenizerScope.cpp' object='WebCore/dom/libWebCore_la-XMLTokenizerScope.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/dom/libWebCore_la-XMLTokenizerScope.lo `test -f 'WebCore/dom/XMLTokenizerScope.cpp' || echo '$(srcdir)/'`WebCore/dom/XMLTokenizerScope.cpp
+
WebCore/editing/libWebCore_la-AppendNodeCommand.lo: WebCore/editing/AppendNodeCommand.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/editing/libWebCore_la-AppendNodeCommand.lo -MD -MP -MF WebCore/editing/$(DEPDIR)/libWebCore_la-AppendNodeCommand.Tpo -c -o WebCore/editing/libWebCore_la-AppendNodeCommand.lo `test -f 'WebCore/editing/AppendNodeCommand.cpp' || echo '$(srcdir)/'`WebCore/editing/AppendNodeCommand.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/editing/$(DEPDIR)/libWebCore_la-AppendNodeCommand.Tpo WebCore/editing/$(DEPDIR)/libWebCore_la-AppendNodeCommand.Plo
@@@ -21481,13 -21551,6 +21553,6 @@@ WebCore/rendering/libWebCore_la-LayoutS
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/rendering/libWebCore_la-LayoutState.lo `test -f 'WebCore/rendering/LayoutState.cpp' || echo '$(srcdir)/'`WebCore/rendering/LayoutState.cpp
- WebCore/rendering/libWebCore_la-ListMarkerBox.lo: WebCore/rendering/ListMarkerBox.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/rendering/libWebCore_la-ListMarkerBox.lo -MD -MP -MF WebCore/rendering/$(DEPDIR)/libWebCore_la-ListMarkerBox.Tpo -c -o WebCore/rendering/libWebCore_la-ListMarkerBox.lo `test -f 'WebCore/rendering/ListMarkerBox.cpp' || echo '$(srcdir)/'`WebCore/rendering/ListMarkerBox.cpp
- @am__fastdepCXX_TRUE@ mv -f WebCore/rendering/$(DEPDIR)/libWebCore_la-ListMarkerBox.Tpo WebCore/rendering/$(DEPDIR)/libWebCore_la-ListMarkerBox.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/rendering/ListMarkerBox.cpp' object='WebCore/rendering/libWebCore_la-ListMarkerBox.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/rendering/libWebCore_la-ListMarkerBox.lo `test -f 'WebCore/rendering/ListMarkerBox.cpp' || echo '$(srcdir)/'`WebCore/rendering/ListMarkerBox.cpp
-
WebCore/rendering/libWebCore_la-RenderApplet.lo: WebCore/rendering/RenderApplet.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/rendering/libWebCore_la-RenderApplet.lo -MD -MP -MF WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderApplet.Tpo -c -o WebCore/rendering/libWebCore_la-RenderApplet.lo `test -f 'WebCore/rendering/RenderApplet.cpp' || echo '$(srcdir)/'`WebCore/rendering/RenderApplet.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderApplet.Tpo WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderApplet.Plo
@@@ -21726,6 -21789,13 +21791,13 @@@ WebCore/rendering/libWebCore_la-RenderS
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/rendering/libWebCore_la-RenderSlider.lo `test -f 'WebCore/rendering/RenderSlider.cpp' || echo '$(srcdir)/'`WebCore/rendering/RenderSlider.cpp
+ WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo: WebCore/rendering/RenderSVGModelObject.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo -MD -MP -MF WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGModelObject.Tpo -c -o WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo `test -f 'WebCore/rendering/RenderSVGModelObject.cpp' || echo '$(srcdir)/'`WebCore/rendering/RenderSVGModelObject.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGModelObject.Tpo WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderSVGModelObject.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/rendering/RenderSVGModelObject.cpp' object='WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/rendering/libWebCore_la-RenderSVGModelObject.lo `test -f 'WebCore/rendering/RenderSVGModelObject.cpp' || echo '$(srcdir)/'`WebCore/rendering/RenderSVGModelObject.cpp
+
WebCore/rendering/libWebCore_la-RenderTable.lo: WebCore/rendering/RenderTable.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/rendering/libWebCore_la-RenderTable.lo -MD -MP -MF WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderTable.Tpo -c -o WebCore/rendering/libWebCore_la-RenderTable.lo `test -f 'WebCore/rendering/RenderTable.cpp' || echo '$(srcdir)/'`WebCore/rendering/RenderTable.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderTable.Tpo WebCore/rendering/$(DEPDIR)/libWebCore_la-RenderTable.Plo
@@@ -25030,6 -25100,20 +25102,20 @@@ WebKit/gtk/WebCoreSupport/libwebkit_1_0
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.lo `test -f 'WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp' || echo '$(srcdir)/'`WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo: WebKit/gtk/webkit/webkitdownload.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo -MD -MP -MF WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Tpo -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo `test -f 'WebKit/gtk/webkit/webkitdownload.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitdownload.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Tpo WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebKit/gtk/webkit/webkitdownload.cpp' object='WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo `test -f 'WebKit/gtk/webkit/webkitdownload.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitdownload.cpp
+
+ WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo: WebKit/gtk/webkit/webkiterror.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo -MD -MP -MF WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkiterror.Tpo -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo `test -f 'WebKit/gtk/webkit/webkiterror.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkiterror.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkiterror.Tpo WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkiterror.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebKit/gtk/webkit/webkiterror.cpp' object='WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkiterror.lo `test -f 'WebKit/gtk/webkit/webkiterror.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkiterror.cpp
+
WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo: WebKit/gtk/webkit/webkitnetworkrequest.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo -MD -MP -MF WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitnetworkrequest.Tpo -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.lo `test -f 'WebKit/gtk/webkit/webkitnetworkrequest.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitnetworkrequest.cpp
@am__fastdepCXX_TRUE@ mv -f WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitnetworkrequest.Tpo WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitnetworkrequest.Plo
@@@ -25100,13 -25184,6 +25186,6 @@@ WebKit/gtk/webkit/libwebkit_1_0_la-webk
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebsettings.lo `test -f 'WebKit/gtk/webkit/webkitwebsettings.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitwebsettings.cpp
- WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo: WebKit/gtk/webkit/webkitdownload.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo -MD -MP -MF WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Tpo -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo `test -f 'WebKit/gtk/webkit/webkitdownload.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitdownload.cpp
- @am__fastdepCXX_TRUE@ mv -f WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Tpo WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebKit/gtk/webkit/webkitdownload.cpp' object='WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo `test -f 'WebKit/gtk/webkit/webkitdownload.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitdownload.cpp
-
WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo: WebKit/gtk/webkit/webkitwebview.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo -MD -MP -MF WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitwebview.Tpo -c -o WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo `test -f 'WebKit/gtk/webkit/webkitwebview.cpp' || echo '$(srcdir)/'`WebKit/gtk/webkit/webkitwebview.cpp
@am__fastdepCXX_TRUE@ mv -f WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitwebview.Tpo WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitwebview.Plo
@@@ -25326,7 -25403,24 +25405,24 @@@ clean-libtool
-rm -rf WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/.libs WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/_libs
distclean-libtool:
- -rm -f libtool config.lt
+ -rm -f libtool
+ install-dist_resourcesDATA: $(dist_resources_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
+ @list='$(dist_resources_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_resourcesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(resourcesdir)/$$f'"; \
+ $(dist_resourcesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(resourcesdir)/$$f"; \
+ done
+
+ uninstall-dist_resourcesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_resources_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(resourcesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(resourcesdir)/$$f"; \
+ done
install-dist_webinspectorDATA: $(dist_webinspector_DATA)
@$(NORMAL_INSTALL)
test -z "$(webinspectordir)" || $(MKDIR_P) "$(DESTDIR)$(webinspectordir)"
@@@ -25418,7 -25512,7 +25514,7 @@@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAG
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@@ -25599,7 -25693,7 +25695,7 @@@ all-am: GNUmakefile $(LIBRARIES) $(LTLI
install-binPROGRAMS: install-libLTLIBRARIES
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(webinspectordir)" "$(DESTDIR)$(webinspectorimagesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libJavaScriptCore_ladir)" "$(DESTDIR)$(libwebkit_1_0_ladir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(webinspectordir)" "$(DESTDIR)$(webinspectorimagesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libJavaScriptCore_ladir)" "$(DESTDIR)$(libwebkit_1_0_ladir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@@ -25805,7 -25899,8 +25901,8 @@@ info: info-a
info-am:
- install-data-am: install-data-local install-dist_webinspectorDATA \
+ install-data-am: install-data-local install-dist_resourcesDATA \
+ install-dist_webinspectorDATA \
install-dist_webinspectorimagesDATA \
install-libJavaScriptCore_laHEADERS \
install-libwebkit_1_0_laHEADERS install-pkgconfigDATA
@@@ -25848,7 -25943,8 +25945,8 @@@ ps: ps-a
ps-am:
- uninstall-am: uninstall-binPROGRAMS uninstall-dist_webinspectorDATA \
+ uninstall-am: uninstall-binPROGRAMS uninstall-dist_resourcesDATA \
+ uninstall-dist_webinspectorDATA \
uninstall-dist_webinspectorimagesDATA \
uninstall-libJavaScriptCore_laHEADERS uninstall-libLIBRARIES \
uninstall-libLTLIBRARIES uninstall-libwebkit_1_0_laHEADERS \
@@@ -25866,7 -25962,7 +25964,7 @@@
distclean-local distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
- install-data-am install-data-local \
+ install-data-am install-data-local install-dist_resourcesDATA \
install-dist_webinspectorDATA \
install-dist_webinspectorimagesDATA install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
@@@ -25879,7 -25975,8 +25977,8 @@@
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-dist_webinspectorDATA \
+ uninstall-binPROGRAMS uninstall-dist_resourcesDATA \
+ uninstall-dist_webinspectorDATA \
uninstall-dist_webinspectorimagesDATA \
uninstall-libJavaScriptCore_laHEADERS uninstall-libLIBRARIES \
uninstall-libLTLIBRARIES uninstall-libwebkit_1_0_laHEADERS \
diff --combined JavaScriptCore/GNUmakefile.am
index 51c8ae0,2b1d857..2840bd0
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@@ -138,7 -138,6 +138,7 @@@ javascriptcore_sources +=
JavaScriptCore/assembler/AssemblerBuffer.h \
JavaScriptCore/assembler/MacroAssembler.h \
JavaScriptCore/assembler/MacroAssemblerX86.h \
+ JavaScriptCore/assembler/MacroAssemblerX86_64.h \
JavaScriptCore/assembler/MacroAssemblerX86Common.h \
JavaScriptCore/os-win32/stdbool.h \
JavaScriptCore/os-win32/stdint.h \
@@@ -163,8 -162,10 +163,10 @@@
JavaScriptCore/profiler/Profiler.h \
JavaScriptCore/profiler/TreeProfile.cpp \
JavaScriptCore/profiler/TreeProfile.h \
+ JavaScriptCore/interpreter/CachedCall.h \
JavaScriptCore/interpreter/CallFrame.cpp \
JavaScriptCore/interpreter/CallFrame.h \
+ JavaScriptCore/interpreter/CallFrameClosure.h \
JavaScriptCore/runtime/TimeoutChecker.cpp \
JavaScriptCore/runtime/TimeoutChecker.h \
JavaScriptCore/runtime/InitializeThreading.cpp \
@@@ -255,7 -256,6 +257,6 @@@
JavaScriptCore/wtf/ThreadSpecific.h \
JavaScriptCore/wtf/Threading.h \
JavaScriptCore/wtf/Threading.cpp \
- JavaScriptCore/wtf/ThreadingGtk.cpp \
JavaScriptCore/wtf/ThreadingPthreads.cpp \
JavaScriptCore/wtf/TypeTraits.cpp \
JavaScriptCore/wtf/TypeTraits.h \
@@@ -263,6 -263,7 +264,7 @@@
JavaScriptCore/wtf/Vector.h \
JavaScriptCore/wtf/VectorTraits.h \
JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
+ JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
JavaScriptCore/wtf/unicode/Collator.h \
JavaScriptCore/wtf/unicode/CollatorDefault.cpp \
JavaScriptCore/wtf/unicode/UTF8.cpp \
@@@ -270,6 -271,7 +272,7 @@@
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/wtf/VMTags.h \
JavaScriptCore/yarr/RegexCompiler.h \
JavaScriptCore/yarr/RegexInterpreter.h \
JavaScriptCore/yarr/RegexJIT.h \
diff --combined JavaScriptCore/wtf/Platform.h
index 560fec8,e085a7f..4b3359f
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -218,13 -218,6 +218,13 @@@
#define WTF_PLATFORM_X86_64 1
#endif
+/* PLATFORM(SPARC) */
+#if defined(__sparc__) \
+ || defined(__sparc)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
/* PLATFORM(SH4) */
#if defined(__SH4__)
#define WTF_PLATFORM_SH4 1
@@@ -250,16 -243,6 +250,16 @@@
# endif
#endif
+/* For undefined platforms */
+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
+#include <sys/param.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#elif __BYTE_ORDER == __PDP_ENDIAN
+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
+#endif
+#endif
+
/* Compiler */
/* COMPILER(MSVC) */
@@@ -378,6 -361,8 +378,8 @@@
#define HAVE_MADV_FREE_REUSE 1
#endif
+ #define HAVE_MADV_FREE 1
+
#elif PLATFORM(WIN_OS)
#define HAVE_FLOAT_H 1
@@@ -516,21 -501,20 +518,20 @@@
#endif
#endif
- /* WREC supports x86 & x86-64, and has been tested on Mac and Windows ('cept on 64-bit on Mac). */
- #if (!defined(ENABLE_WREC) && PLATFORM(X86) && PLATFORM(MAC)) \
- || (!defined(ENABLE_WREC) && PLATFORM(X86_64) && PLATFORM(MAC)) \
- || (!defined(ENABLE_WREC) && PLATFORM(X86) && PLATFORM(WIN))
- #define ENABLE_WREC 1
- #endif
-
/* Yet Another Regex Runtime. */
- #define ENABLE_YARR 0
- #define ENABLE_YARR_JIT 0
+ /* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */
+ #if (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(MAC)) \
+ || (!defined(ENABLE_YARR_JIT) && PLATFORM(X86_64) && PLATFORM(MAC)) \
+ || (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(WIN))
+ #define ENABLE_YARR 1
+ #define ENABLE_YARR_JIT 1
+ #endif
+ /* Sanity Check */
#if ENABLE(YARR_JIT) && !ENABLE(YARR)
#error "YARR_JIT requires YARR"
#endif
- #if ENABLE(JIT) || ENABLE(WREC)
+ #if ENABLE(JIT) || ENABLE(YARR_JIT)
#define ENABLE_ASSEMBLER 1
#endif
diff --combined configure
index 08d9eb4,36fe5d2..9acf69e
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for WebKit 1.1.5.
+ # Generated by GNU Autoconf 2.63 for WebKit 1.1.6.
#
# Report bugs to <http://bugs.webkit.org/>.
#
@@@ -745,8 -745,8 +745,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='WebKit'
PACKAGE_TARNAME='webkit'
- PACKAGE_VERSION='1.1.5'
- PACKAGE_STRING='WebKit 1.1.5'
+ PACKAGE_VERSION='1.1.6'
+ PACKAGE_STRING='WebKit 1.1.6'
PACKAGE_BUGREPORT='http://bugs.webkit.org/'
ac_unique_file="WebCore/config.h"
@@@ -886,6 -886,8 +886,8 @@@ LIBSOUP_LIB
LIBSOUP_CFLAGS
XT_LIBS
XT_CFLAGS
+ ENCHANT_LIBS
+ ENCHANT_CFLAGS
GTK_LIBS
GTK_CFLAGS
CAIRO_LIBS
@@@ -1110,6 -1112,8 +1112,8 @@@ CAIRO_CFLAG
CAIRO_LIBS
GTK_CFLAGS
GTK_LIBS
+ ENCHANT_CFLAGS
+ ENCHANT_LIBS
XT_CFLAGS
XT_LIBS
LIBSOUP_CFLAGS
@@@ -1678,7 -1682,7 +1682,7 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
- \`configure' configures WebKit 1.1.5 to adapt to many kinds of systems.
+ \`configure' configures WebKit 1.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1749,7 -1753,7 +1753,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of WebKit 1.1.5:";;
+ short | recursive ) echo "Configuration of WebKit 1.1.6:";;
esac
cat <<\_ACEOF
@@@ -1852,6 -1856,10 +1856,10 @@@ Some influential environment variables
CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
+ ENCHANT_CFLAGS
+ C compiler flags for ENCHANT, overriding pkg-config
+ ENCHANT_LIBS
+ linker flags for ENCHANT, overriding pkg-config
XT_CFLAGS C compiler flags for XT, overriding pkg-config
XT_LIBS linker flags for XT, overriding pkg-config
LIBSOUP_CFLAGS
@@@ -1949,7 -1957,7 +1957,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- WebKit configure 1.1.5
+ WebKit configure 1.1.6
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1963,7 -1971,7 +1971,7 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by WebKit $as_me 1.1.5, which was
+ It was created by WebKit $as_me 1.1.6, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@@ -2498,14 -2506,14 +2506,14 @@@ test -n "$target_alias" &
WEBKIT_MAJOR_VERSION=1
WEBKIT_MINOR_VERSION=1
- WEBKIT_MICRO_VERSION=5
+ WEBKIT_MICRO_VERSION=6
- LIBWEBKITGTK_VERSION=5:0:3
+ LIBWEBKITGTK_VERSION=6:0:4
am__api_version='1.10'
@@@ -2825,7 -2833,7 +2833,7 @@@ f
# Define the identity of the package.
PACKAGE='webkit'
- VERSION='1.1.5'
+ VERSION='1.1.6'
cat >>confdefs.h <<_ACEOF
@@@ -5786,9 -5794,8 +5794,8 @@@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_std
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
- am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
- eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
- if test "$am_t" != yes; then
+ ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
@@@ -8258,13 -8265,13 +8265,13 @@@ if test "${lt_cv_nm_interface+set}" = s
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8261: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8268: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8264: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8271: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8267: output\"" >&5)
+ (eval echo "\"\$as_me:8274: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@@ -8731,7 -8738,7 +8738,7 @@@ linux* | k*bsd*-gnu
lt_cv_deplibs_check_method=pass_all
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@@ -9466,7 -9473,7 +9473,7 @@@ ia64-*-hpux*
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9469 "configure"' > conftest.$ac_ext
+ echo '#line 9476 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@@ -11521,11 -11528,11 +11528,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11524: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11531: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11528: \$? = $ac_status" >&5
+ echo "$as_me:11535: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@@ -11860,11 -11867,11 +11867,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11863: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11870: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11867: \$? = $ac_status" >&5
+ echo "$as_me:11874: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@@ -11965,11 -11972,11 +11972,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11968: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11975: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11972: \$? = $ac_status" >&5
+ echo "$as_me:11979: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -12020,11 -12027,11 +12027,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12023: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12030: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12027: \$? = $ac_status" >&5
+ echo "$as_me:12034: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -12139,9 -12146,6 +12146,6 @@@ $as_echo_n "checking whether the $compi
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@@ -12324,7 -12328,7 +12328,7 @@@ _LT_EO
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@@ -12499,7 -12503,6 +12503,6 @@@ _LT_EO
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@@ -12914,7 -12917,7 +12917,7 @@@ rm -f core conftest.err conftest.$ac_ob
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@@ -13876,10 -13879,13 +13879,13 @@@ rm -f core conftest.err conftest.$ac_ob
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@@ -13891,18 -13897,6 +13897,6 @@@
dynamic_linker='GNU/Linux ld.so'
;;
- netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@@ -14836,7 -14830,7 +14830,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 14839 "configure"
+ #line 14833 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -14932,7 -14926,7 +14926,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 14935 "configure"
+ #line 14929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -16828,7 -16822,7 +16822,7 @@@ $as_echo_n "checking for $compiler opti
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@@ -16952,11 -16946,11 +16946,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16955: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16949: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16959: \$? = $ac_status" >&5
+ echo "$as_me:16953: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@@ -17051,11 -17045,11 +17045,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17054: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17048: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17058: \$? = $ac_status" >&5
+ echo "$as_me:17052: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -17103,11 -17097,11 +17097,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17106: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17100: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17110: \$? = $ac_status" >&5
+ echo "$as_me:17104: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -17179,9 -17173,6 +17173,6 @@@ $as_echo_n "checking whether the $compi
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@@ -17753,10 -17744,13 +17744,13 @@@ rm -f core conftest.err conftest.$ac_ob
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@@ -17768,18 -17762,6 +17762,6 @@@
dynamic_linker='GNU/Linux ld.so'
;;
- netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@@ -19208,11 -19190,10 +19190,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for HILDON" >&5
$as_echo_n "checking for HILDON... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$HILDON_CFLAGS"; then
- pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$HILDON_CFLAGS"; then
+ pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
@@@ -19222,15 -19203,13 +19203,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$HILDON_LIBS"; then
- pkg_cv_HILDON_LIBS="$HILDON_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$HILDON_LIBS"; then
+ pkg_cv_HILDON_LIBS="$HILDON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
@@@ -19240,9 -19219,8 +19219,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -19255,9 -19233,9 +19233,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1"`
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hildon-1" 2>&1`
else
- HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1"`
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --print-errors "hildon-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HILDON_PKG_ERRORS" >&5
@@@ -19337,6 -19315,7 +19315,7 @@@ LIBXSLT_REQUIRED_VERSION=1.1.
SQLITE_REQUIRED_VERSION=3.0
GSTREAMER_REQUIRED_VERSION=0.10
GNOME_KEYRING_REQUIRED_VERSION=2.26.0
+ ENCHANT_REQUIRED_VERSION=0.22
# Available modules
#
@@@ -19357,11 -19336,10 +19336,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
$as_echo_n "checking for GLIB... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GOBJECT_REQUIRED_VERSION
gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION\"") >&5
@@@ -19377,15 -19355,13 +19355,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GOBJECT_REQUIRED_VERSION
gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION\"") >&5
@@@ -19401,9 -19377,8 +19377,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -19416,13 -19391,13 +19391,13 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
- gthread-2.0 >= $GTHREAD_REQUIRED_VERSION"`
+ gthread-2.0 >= $GTHREAD_REQUIRED_VERSION" 2>&1`
else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
- gthread-2.0 >= $GTHREAD_REQUIRED_VERSION"`
+ gthread-2.0 >= $GTHREAD_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
@@@ -19682,11 -19657,10 +19657,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for LIBXML" >&5
$as_echo_n "checking for LIBXML... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML_CFLAGS"; then
- pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBXML_CFLAGS"; then
+ pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -19696,15 -19670,13 +19670,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML_LIBS"; then
- pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBXML_LIBS"; then
+ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -19714,9 -19686,8 +19686,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -19729,9 -19700,9 +19700,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>&1`
else
- LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML_PKG_ERRORS" >&5
@@@ -19798,11 -19769,10 +19769,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for PANGO" >&5
$as_echo_n "checking for PANGO... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
pangoft2\"") >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED_VERSION
@@@ -19815,15 -19785,13 +19785,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
pangoft2\"") >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED_VERSION
@@@ -19836,9 -19804,8 +19804,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -19851,11 -19818,11 +19818,11 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED_VERSION
- pangoft2"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED_VERSION
+ pangoft2" 2>&1`
else
- PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED_VERSION
- pangoft2"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED_VERSION
+ pangoft2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PANGO_PKG_ERRORS" >&5
@@@ -19926,11 -19893,10 +19893,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -19940,15 -19906,13 +19906,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -19958,9 -19922,8 +19922,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -19973,9 -19936,9 +19936,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
@@@ -20039,11 -20002,10 +20002,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20053,15 -20015,13 +20015,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20071,9 -20031,8 +20031,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -20086,9 -20045,9 +20045,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@@ -20158,11 -20117,10 +20117,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20172,15 -20130,13 +20130,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20190,9 -20146,8 +20146,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -20205,9 -20160,9 +20160,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo >= $CAIRO_REQUIRED_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= $CAIRO_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
@@@ -20271,11 -20226,10 +20226,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20285,15 -20239,13 +20239,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -20303,9 -20255,8 +20255,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -20318,9 -20269,9 +20269,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@@ -20380,6 -20331,115 +20331,115 @@@ $as_echo "yes" >&6;
:
fi
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for ENCHANT" >&5
+ $as_echo_n "checking for ENCHANT... " >&6; }
+
+ if test -n "$ENCHANT_CFLAGS"; then
+ pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED_VERSION\"") >&5
+ ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= $ENCHANT_REQUIRED_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+ if test -n "$ENCHANT_LIBS"; then
+ pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED_VERSION\"") >&5
+ ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= $ENCHANT_REQUIRED_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION" 2>&1`
+ else
+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ENCHANT_PKG_ERRORS" >&5
+
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (enchant >= $ENCHANT_REQUIRED_VERSION) were not met:
+
+ $ENCHANT_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+ Alternatively, you may set the environment variables ENCHANT_CFLAGS
+ and ENCHANT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+ $as_echo "$as_me: error: Package requirements (enchant >= $ENCHANT_REQUIRED_VERSION) were not met:
+
+ $ENCHANT_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+ Alternatively, you may set the environment variables ENCHANT_CFLAGS
+ and ENCHANT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&2;}
+ { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ Alternatively, you may set the environment variables ENCHANT_CFLAGS
+ and ENCHANT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ Alternatively, you may set the environment variables ENCHANT_CFLAGS
+ and ENCHANT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+ else
+ ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS
+ ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
if test "$with_target" = "x11" && test "$os_win32" = "no"; then
# check for XT
@@@ -20387,11 -20447,10 +20447,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for XT" >&5
$as_echo_n "checking for XT... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$XT_CFLAGS"; then
- pkg_cv_XT_CFLAGS="$XT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$XT_CFLAGS"; then
+ pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@@ -20401,15 -20460,13 +20460,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$XT_LIBS"; then
- pkg_cv_XT_LIBS="$XT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$XT_LIBS"; then
+ pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@@ -20419,9 -20476,8 +20476,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -20434,9 -20490,9 +20490,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
else
- XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XT_PKG_ERRORS" >&5
@@@ -20547,6 -20603,8 +20603,8 @@@ f
+
+
# check whether to build with debugging enabled
{ $as_echo "$as_me:$LINENO: checking whether to do a debug build" >&5
$as_echo_n "checking whether to do a debug build... " >&6; }
@@@ -20908,7 -20966,7 +20966,7 @@@ f
if test "$enable_jit" = "yes"; then
case "$target_cpu" in
- i*86)
+ i*86|x86_64)
cat >>confdefs.h <<\_ACEOF
#define ENABLE_JIT 1
@@@ -20934,27 -20992,11 +20992,27 @@@ cat >>confdefs.h <<\_ACEO
#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1
_ACEOF
+ case "$target_cpu" in
+ i*86)
cat >>confdefs.h <<\_ACEOF
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
_ACEOF
+ ;;
+ x86_64)
+
+cat >>confdefs.h <<\_ACEOF
+#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define WTF_USE_ALTERNATE_JSIMMEDIATE 1
+_ACEOF
+
+ ;;
+ esac
;;
*)
enable_jit="no (CPU '$target_cpu' not supported)"
@@@ -21011,11 -21053,10 +21069,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for LIBSOUP" >&5
$as_echo_n "checking for LIBSOUP... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_CFLAGS"; then
- pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBSOUP_CFLAGS"; then
+ pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21025,15 -21066,13 +21082,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_LIBS"; then
- pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBSOUP_LIBS"; then
+ pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21043,9 -21082,8 +21098,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21058,9 -21096,9 +21112,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>&1`
else
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_PKG_ERRORS" >&5
@@@ -21128,11 -21166,10 +21182,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GNOMEKEYRING" >&5
$as_echo_n "checking for GNOMEKEYRING... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GNOMEKEYRING_CFLAGS"; then
- pkg_cv_GNOMEKEYRING_CFLAGS="$GNOMEKEYRING_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GNOMEKEYRING_CFLAGS"; then
+ pkg_cv_GNOMEKEYRING_CFLAGS="$GNOMEKEYRING_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21142,15 -21179,13 +21195,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GNOMEKEYRING_LIBS"; then
- pkg_cv_GNOMEKEYRING_LIBS="$GNOMEKEYRING_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GNOMEKEYRING_LIBS"; then
+ pkg_cv_GNOMEKEYRING_LIBS="$GNOMEKEYRING_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21160,9 -21195,8 +21211,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21175,9 -21209,9 +21225,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION"`
+ GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>&1`
else
- GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION"`
+ GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOMEKEYRING_PKG_ERRORS" >&5
@@@ -21248,11 -21282,10 +21298,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@@ -21265,15 -21298,13 +21314,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_LIBS"; then
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@@ -21286,9 -21317,8 +21333,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21301,11 -21331,11 +21347,11 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
else
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
@@@ -21372,11 -21402,10 +21418,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
@@@ -21392,15 -21421,13 +21437,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_LIBS"; then
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
@@@ -21416,9 -21443,8 +21459,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21431,13 -21457,13 +21473,13 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-ft
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
else
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-ft
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
@@@ -21515,11 -21541,10 +21557,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for SQLITE3" >&5
$as_echo_n "checking for SQLITE3... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_CFLAGS"; then
- pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$SQLITE3_CFLAGS"; then
+ pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21529,15 -21554,13 +21570,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_LIBS"; then
- pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$SQLITE3_LIBS"; then
+ pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21547,9 -21570,8 +21586,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21562,9 -21584,9 +21600,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>&1`
else
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SQLITE3_PKG_ERRORS" >&5
@@@ -21634,11 -21656,10 +21672,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5
$as_echo_n "checking for LIBXSLT... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXSLT_CFLAGS"; then
- pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBXSLT_CFLAGS"; then
+ pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21648,15 -21669,13 +21685,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXSLT_LIBS"; then
- pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$LIBXSLT_LIBS"; then
+ pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@@ -21666,9 -21685,8 +21701,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21681,9 -21699,9 +21715,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION"`
+ LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>&1`
else
- LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION"`
+ LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXSLT_PKG_ERRORS" >&5
@@@ -21753,11 -21771,10 +21787,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GEOCLUE" >&5
$as_echo_n "checking for GEOCLUE... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GEOCLUE_CFLAGS"; then
- pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GEOCLUE_CFLAGS"; then
+ pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
@@@ -21767,15 -21784,13 +21800,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GEOCLUE_LIBS"; then
- pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GEOCLUE_LIBS"; then
+ pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
@@@ -21785,9 -21800,8 +21816,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21800,9 -21814,9 +21830,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "geoclue"`
+ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "geoclue" 2>&1`
else
- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "geoclue"`
+ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "geoclue" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GEOCLUE_PKG_ERRORS" >&5
@@@ -21872,11 -21886,10 +21902,10 @@@ pkg_failed=n
{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_CFLAGS"; then
- pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GSTREAMER_CFLAGS"; then
+ pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10\"") >&5
@@@ -21892,15 -21905,13 +21921,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_LIBS"; then
- pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$GSTREAMER_LIBS"; then
+ pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10\"") >&5
@@@ -21916,9 -21927,8 +21943,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -21931,13 -21941,13 +21957,13 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
- gstreamer-plugins-base-0.10"`
+ gstreamer-plugins-base-0.10" 2>&1`
else
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
- gstreamer-plugins-base-0.10"`
+ gstreamer-plugins-base-0.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5
@@@ -23157,7 -23167,7 +23183,7 @@@ exec 6>&
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by WebKit $as_me 1.1.5, which was
+ This file was extended by WebKit $as_me 1.1.6, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -23220,7 -23230,7 +23246,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- WebKit config.status 1.1.5
+ WebKit config.status 1.1.6
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@@ -24357,16 -24367,7 +24383,7 @@@ $as_echo "$as_me: executing $ac_file co
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
diff --combined configure.ac
index e2c9f40,52fdfc0..f58b49f
--- a/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@ AC_PREREQ(2.59
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [1])
- m4_define([webkit_micro_version], [5])
+ m4_define([webkit_micro_version], [6])
AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
@@@ -24,7 -24,7 +24,7 @@@ AC_CONFIG_SRCDIR([WebCore/config.h]
dnl # Libtool library version, not to confuse with API version
dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
- LIBWEBKITGTK_VERSION=5:0:3
+ LIBWEBKITGTK_VERSION=6:0:4
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@@ -191,6 -191,7 +191,7 @@@ LIBXSLT_REQUIRED_VERSION=1.1.
SQLITE_REQUIRED_VERSION=3.0
GSTREAMER_REQUIRED_VERSION=0.10
GNOME_KEYRING_REQUIRED_VERSION=2.26.0
+ ENCHANT_REQUIRED_VERSION=0.22
# Available modules
#
@@@ -223,6 -224,7 +224,7 @@@ if test "$with_target" = "directfb"; th
else
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
if test "$with_target" = "x11" && test "$os_win32" = "no"; then
# check for XT
@@@ -249,6 -251,8 +251,8 @@@ AC_SUBST(GTK_CFLAGS
AC_SUBST(GTK_LIBS)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
+ AC_SUBST(ENCHANT_CFLAGS)
+ AC_SUBST(ENCHANT_LIBS)
# check whether to build with debugging enabled
AC_MSG_CHECKING([whether to do a debug build])
@@@ -483,21 -487,13 +487,21 @@@ AC_ARG_ENABLE([jit]
[],[enable_jit="yes"])
if test "$enable_jit" = "yes"; then
case "$target_cpu" in
- i*86)
+ i*86|x86_64)
AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
AC_DEFINE([ENABLE_WREC], [1], [Define to enable WREC])
AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
- AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
+ case "$target_cpu" in
+ i*86)
+ AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
+ ;;
+ x86_64)
+ AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
+ AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
+ ;;
+ esac
;;
*)
enable_jit="no (CPU '$target_cpu' not supported)"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list