[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.1.5-137-g33c3199
Mike Hommey
glandium at debian.org
Thu Apr 16 20:33:22 UTC 2009
The following commit has been merged in the debian/experimental branch:
commit 9bce0ce6e51883d38dc2c973017fd5af1b4bac5d
Merge: b29143fa22bb955b6d51b5e80374d7ec030ba7f4 302f0af42c4a5e4a13046edff1dff8a3209ff4b4
Author: Mike Hommey <glandium at debian.org>
Date: Thu Apr 16 22:28:27 2009 +0200
Merge branch 'webkit-1.1' into debian/experimental
diff --combined GNUmakefile.in
index 5b5b3d0,3668e58..5716475
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@@ -1,4 -1,4 +1,4 @@@
- # GNUmakefile.in generated by automake 1.10.1 from GNUmakefile.am.
+ # GNUmakefile.in generated by automake 1.10.2 from GNUmakefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@@ -42,6 -42,23 +42,23 @@@
# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
# specific port
+ # Gettext stuff; based on the contents of the Makefile.in.in file
+ # distributed with GNU Gettext.
+ #
+ # The original copyright notice follows:
+ #
+ # Makefile for PO directory in any package using GNU gettext.
+ # Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions. It can
+ # be used in projects which are not available under the GNU General Public
+ # License but which still want to provide support for the GNU gettext
+ # functionality.
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+
@@@ -100,15 -117,14 +117,14 @@@ DIST_COMMON = README $(am__configure_de
$(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in \
$(srcdir)/JavaScriptCore/GNUmakefile.am \
$(srcdir)/WebCore/GNUmakefile.am \
+ $(srcdir)/WebKit/gtk/po/GNUmakefile.am \
$(srcdir)/WebKitTools/GNUmakefile.am \
$(srcdir)/autotoolsconfig.h.in \
$(top_srcdir)/WebKit/gtk/webkit.pc.in \
$(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 \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing mkinstalldirs
+ autotools/install-sh autotools/ltmain.sh autotools/missing
# Debug build
@ENABLE_DEBUG_TRUE at am__append_10 = \
@@@ -269,6 -285,7 +285,7 @@@
@ENABLE_DEBUG_TRUE@ JavaScriptCore/runtime/Tracing.h \
@ENABLE_DEBUG_TRUE@ JavaScriptCore/runtime/UString.cpp \
@ENABLE_DEBUG_TRUE@ JavaScriptCore/runtime/UString.h \
+ @ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/FastAllocBase.h \
@ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/FastMalloc.cpp \
@ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/FastMalloc.h \
@ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/MallocZoneSupport.h \
@@@ -1310,6 -1327,7 +1327,7 @@@ subdir =
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/dolt.m4 \
+ $(top_srcdir)/autotools/gtk-doc.m4 \
$(top_srcdir)/autotools/libtool.m4 \
$(top_srcdir)/autotools/ltoptions.m4 \
$(top_srcdir)/autotools/ltsugar.m4 \
@@@ -1457,7 -1475,6 +1475,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 \
@@@ -1573,6 -1590,11 +1591,11 @@@
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/yarr/RegexCompiler.h \
+ JavaScriptCore/yarr/RegexInterpreter.h \
+ JavaScriptCore/yarr/RegexJIT.h \
+ JavaScriptCore/yarr/RegexParser.h \
+ JavaScriptCore/yarr/RegexPattern.h \
JavaScriptCore/interpreter/RegisterFile.cpp \
JavaScriptCore/interpreter/RegisterFile.h \
JavaScriptCore/bytecompiler/BytecodeGenerator.cpp \
@@@ -1724,6 -1746,7 +1747,7 @@@
JavaScriptCore/runtime/Tracing.h \
JavaScriptCore/runtime/UString.cpp \
JavaScriptCore/runtime/UString.h \
+ JavaScriptCore/wtf/FastAllocBase.h \
JavaScriptCore/wtf/FastMalloc.cpp \
JavaScriptCore/wtf/FastMalloc.h \
JavaScriptCore/wtf/MallocZoneSupport.h \
@@@ -1907,6 -1930,7 +1931,7 @@@ am__libWebCore_la_SOURCES_DIST = WebCor
WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp \
WebCore/bindings/js/JSClipboardCustom.cpp \
WebCore/bindings/js/JSConsoleCustom.cpp \
+ WebCore/bindings/js/JSCoordinatesCustom.cpp \
WebCore/bindings/js/JSCustomPositionCallback.cpp \
WebCore/bindings/js/JSCustomPositionCallback.h \
WebCore/bindings/js/JSCustomPositionErrorCallback.cpp \
@@@ -2030,6 -2054,7 +2055,7 @@@
WebCore/bindings/js/ScriptObjectQuarantine.cpp \
WebCore/bindings/js/ScriptObjectQuarantine.h \
WebCore/bindings/js/ScriptSourceCode.h \
+ WebCore/bindings/js/ScriptState.cpp \
WebCore/bindings/js/ScriptState.h \
WebCore/bindings/js/ScriptString.h \
WebCore/bindings/js/ScriptValue.cpp \
@@@ -2197,8 -2222,8 +2223,8 @@@
WebCore/dom/MessageChannel.cpp WebCore/dom/MessageChannel.h \
WebCore/dom/MessageEvent.cpp WebCore/dom/MessageEvent.h \
WebCore/dom/MessagePort.cpp WebCore/dom/MessagePort.h \
- WebCore/dom/MouseEvent.cpp WebCore/dom/MouseEvent.h \
- WebCore/dom/MouseRelatedEvent.cpp \
+ WebCore/dom/MessagePortProxy.h WebCore/dom/MouseEvent.cpp \
+ WebCore/dom/MouseEvent.h WebCore/dom/MouseRelatedEvent.cpp \
WebCore/dom/MouseRelatedEvent.h WebCore/dom/MutationEvent.cpp \
WebCore/dom/MutationEvent.h WebCore/dom/NameNodeList.cpp \
WebCore/dom/NameNodeList.h WebCore/dom/NamedAttrMap.cpp \
@@@ -4106,6 -4131,7 +4132,7 @@@ am__objects_17 = WebCore/bindings/js/li
WebCore/bindings/js/libWebCore_la-JSCanvasRenderingContext2DCustom.lo \
WebCore/bindings/js/libWebCore_la-JSClipboardCustom.lo \
WebCore/bindings/js/libWebCore_la-JSConsoleCustom.lo \
+ WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.lo \
WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.lo \
WebCore/bindings/js/libWebCore_la-JSCustomPositionErrorCallback.lo \
WebCore/bindings/js/libWebCore_la-JSCustomVoidCallback.lo \
@@@ -4183,6 -4209,7 +4210,7 @@@
WebCore/bindings/js/libWebCore_la-ScriptFunctionCall.lo \
WebCore/bindings/js/libWebCore_la-ScriptObject.lo \
WebCore/bindings/js/libWebCore_la-ScriptObjectQuarantine.lo \
+ WebCore/bindings/js/libWebCore_la-ScriptState.lo \
WebCore/bindings/js/libWebCore_la-ScriptValue.lo \
WebCore/bridge/libWebCore_la-IdentifierRep.lo \
WebCore/bridge/libWebCore_la-NP_jsobject.lo \
@@@ -4909,7 -4936,8 +4937,8 @@@ libwebkit_1_0_la_LINK = $(LIBTOOL) --ta
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
am__EXEEXT_1 = Programs/unittests/testwebframe$(EXEEXT) \
Programs/unittests/testwebbackforwardlist$(EXEEXT) \
- Programs/unittests/testwebhistoryitem$(EXEEXT)
+ Programs/unittests/testwebhistoryitem$(EXEEXT) \
+ Programs/unittests/testdownload$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_Programs_DumpRenderTree_OBJECTS = WebKitTools/DumpRenderTree/Programs_DumpRenderTree-GCController.$(OBJEXT) \
WebKitTools/DumpRenderTree/Programs_DumpRenderTree-LayoutTestController.$(OBJEXT) \
@@@ -4921,6 -4949,7 +4950,7 @@@
Programs_DumpRenderTree_OBJECTS = \
$(am_Programs_DumpRenderTree_OBJECTS)
Programs_DumpRenderTree_DEPENDENCIES = libwebkit-1.0.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
Programs_DumpRenderTree_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@@ -4930,7 -4959,7 +4960,7 @@@ am_Programs_GtkLauncher_OBJECTS =
WebKitTools/GtkLauncher/Programs_GtkLauncher-main.$(OBJEXT)
Programs_GtkLauncher_OBJECTS = $(am_Programs_GtkLauncher_OBJECTS)
Programs_GtkLauncher_DEPENDENCIES = libwebkit-1.0.la \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
Programs_GtkLauncher_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(Programs_GtkLauncher_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@@ -4952,11 -4981,19 +4982,19 @@@ Programs_minidom_DEPENDENCIES = libJava
Programs_minidom_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(Programs_minidom_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_Programs_unittests_testdownload_OBJECTS = WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.$(OBJEXT)
+ Programs_unittests_testdownload_OBJECTS = \
+ $(am_Programs_unittests_testdownload_OBJECTS)
+ am__DEPENDENCIES_3 = libwebkit-1.0.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ Programs_unittests_testdownload_DEPENDENCIES = $(am__DEPENDENCIES_3)
+ Programs_unittests_testdownload_LINK = $(LIBTOOL) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(Programs_unittests_testdownload_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_Programs_unittests_testwebbackforwardlist_OBJECTS = WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT)
Programs_unittests_testwebbackforwardlist_OBJECTS = \
$(am_Programs_unittests_testwebbackforwardlist_OBJECTS)
- am__DEPENDENCIES_3 = libwebkit-1.0.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
Programs_unittests_testwebbackforwardlist_DEPENDENCIES = \
$(am__DEPENDENCIES_3)
Programs_unittests_testwebbackforwardlist_LINK = $(LIBTOOL) --tag=CC \
@@@ -5005,6 -5042,7 +5043,7 @@@ SOURCES = $(TestNetscapePlugin_libtestn
$(Programs_DumpRenderTree_SOURCES) \
$(Programs_GtkLauncher_SOURCES) $(Programs_jsc_SOURCES) \
$(Programs_minidom_SOURCES) \
+ $(Programs_unittests_testdownload_SOURCES) \
$(Programs_unittests_testwebbackforwardlist_SOURCES) \
$(Programs_unittests_testwebframe_SOURCES) \
$(Programs_unittests_testwebhistoryitem_SOURCES)
@@@ -5014,6 -5052,7 +5053,7 @@@ DIST_SOURCES = $(am__TestNetscapePlugin
$(Programs_DumpRenderTree_SOURCES) \
$(Programs_GtkLauncher_SOURCES) $(Programs_jsc_SOURCES) \
$(Programs_minidom_SOURCES) \
+ $(Programs_unittests_testdownload_SOURCES) \
$(Programs_unittests_testwebbackforwardlist_SOURCES) \
$(Programs_unittests_testwebframe_SOURCES) \
$(Programs_unittests_testwebhistoryitem_SOURCES)
@@@ -5334,6 -5373,7 +5374,7 @@@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS
FREETYPE_LIBS = @FREETYPE_LIBS@
GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@
GEOCLUE_LIBS = @GEOCLUE_LIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_LIBS = @GLIB_LIBS@
@@@ -5344,11 -5384,13 +5385,13 @@@ GPERF = @GPERF
GREP = @GREP@
GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HILDON_CFLAGS = @HILDON_CFLAGS@
HILDON_CPPFLAGS = @HILDON_CPPFLAGS@
HILDON_LIBS = @HILDON_LIBS@
+ HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@@ -5465,6 -5507,7 +5508,7 @@@ target_alias = @target_alias
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@@ -5599,14 -5642,21 +5643,21 @@@ IDL_BINDINGS := WebCore/css/CSSCharsetR
$(am__append_41) $(am__append_47) $(am__append_68)
TEST_PROGS := Programs/unittests/testwebframe \
Programs/unittests/testwebbackforwardlist \
- Programs/unittests/testwebhistoryitem
+ Programs/unittests/testwebhistoryitem \
+ Programs/unittests/testdownload
+
+ # Gettext stuff
+ POFILES := $(shell ls $(srcdir)/WebKit/gtk/po/*.po)
+ MOFILES := $(shell echo $(POFILES) | sed "s,^$(srcdir)/,,g" | sed \
+ 's/\.po/.mo/g')
# Global flags to CPP
#
# Extra checks and flags
global_cppflags := -DWTF_USE_ICU_UNICODE=1 -DBUILDING_CAIRO__=1 \
- -DBUILDING_GTK__=1 -DWTF_CHANGES $(am__append_2) \
+ -DBUILDING_GTK__=1 -DWTF_CHANGES \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_6) \
$(am__append_7) $(am__append_8)
@@@ -5664,6 -5714,7 +5715,7 @@@ javascriptcore_cppflags := -I$(srcdir)/
-I$(srcdir)/JavaScriptCore/wrec -I$(srcdir)/JavaScriptCore/jit \
-I$(srcdir)/JavaScriptCore/assembler \
-I$(srcdir)/JavaScriptCore/wtf/unicode \
+ -I$(srcdir)/JavaScriptCore/yarr \
-I$(top_builddir)/JavaScriptCore/pcre \
-I$(top_builddir)/JavaScriptCore/parser \
-I$(top_builddir)/JavaScriptCore/runtime
@@@ -5760,7 -5811,6 +5812,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 \
@@@ -5875,7 -5925,12 +5927,12 @@@
JavaScriptCore/wtf/unicode/UTF8.h \
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
- JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h $(am__append_11) \
+ JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/yarr/RegexCompiler.h \
+ JavaScriptCore/yarr/RegexInterpreter.h \
+ JavaScriptCore/yarr/RegexJIT.h \
+ JavaScriptCore/yarr/RegexParser.h \
+ JavaScriptCore/yarr/RegexPattern.h $(am__append_11) \
$(am__append_13)
javascriptcore_built_sources := $(am__append_10)
javascriptcore_built_nosources := DerivedSources/Lexer.lut.h \
@@@ -5983,6 -6038,7 +6040,7 @@@ webcore_sources := WebCore/WebCorePrefi
WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp \
WebCore/bindings/js/JSClipboardCustom.cpp \
WebCore/bindings/js/JSConsoleCustom.cpp \
+ WebCore/bindings/js/JSCoordinatesCustom.cpp \
WebCore/bindings/js/JSCustomPositionCallback.cpp \
WebCore/bindings/js/JSCustomPositionCallback.h \
WebCore/bindings/js/JSCustomPositionErrorCallback.cpp \
@@@ -6106,6 -6162,7 +6164,7 @@@
WebCore/bindings/js/ScriptObjectQuarantine.cpp \
WebCore/bindings/js/ScriptObjectQuarantine.h \
WebCore/bindings/js/ScriptSourceCode.h \
+ WebCore/bindings/js/ScriptState.cpp \
WebCore/bindings/js/ScriptState.h \
WebCore/bindings/js/ScriptString.h \
WebCore/bindings/js/ScriptValue.cpp \
@@@ -6273,8 -6330,8 +6332,8 @@@
WebCore/dom/MessageChannel.cpp WebCore/dom/MessageChannel.h \
WebCore/dom/MessageEvent.cpp WebCore/dom/MessageEvent.h \
WebCore/dom/MessagePort.cpp WebCore/dom/MessagePort.h \
- WebCore/dom/MouseEvent.cpp WebCore/dom/MouseEvent.h \
- WebCore/dom/MouseRelatedEvent.cpp \
+ WebCore/dom/MessagePortProxy.h WebCore/dom/MouseEvent.cpp \
+ WebCore/dom/MouseEvent.h WebCore/dom/MouseRelatedEvent.cpp \
WebCore/dom/MouseRelatedEvent.h WebCore/dom/MutationEvent.cpp \
WebCore/dom/MutationEvent.h WebCore/dom/NameNodeList.cpp \
WebCore/dom/NameNodeList.h WebCore/dom/NamedAttrMap.cpp \
@@@ -7519,12 -7576,10 +7578,10 @@@ libwebkit_1_0_la_LIBADD =
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
- stamp_files := \
- stamp-webkitmarshal.cpp \
- stamp-webkitmarshal.h \
- stamp-webkitenumtypes.cpp \
- stamp-webkitenumtypes.h
+ # clean rules
+ stamp_files := stamp-webkitmarshal.cpp stamp-webkitmarshal.h \
+ stamp-webkitenumtypes.cpp stamp-webkitenumtypes.h stamp-po
WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
@@@ -7538,18 -7593,27 +7595,27 @@@ EXTRA_DIST =
$(srcdir)/autotools/symbols.filter \
$(srcdir)/WebKit/gtk/ChangeLog \
$(srcdir)/WebKit/gtk/NEWS \
- $(srcdir)/WebKit/gtk/webkitmarshal.list
+ $(srcdir)/WebKit/gtk/webkitmarshal.list \
+ $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
+ $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
+ $(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/*
# Files that will be cleaned
MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile \
- doltlibtool $(srcdir)/aconfig.h.in \
+ doltlibtool WebKit/gtk/docs/version.xml \
+ WebKit/gtk/docs/GNUmakefile $(MOFILES) $(srcdir)/aconfig.h.in \
$(srcdir)/autotools/config.* $(srcdir)/autotools/compile \
$(srcdir)/autotools/depcomp $(srcdir)/autotools/install-sh \
$(srcdir)/autotools/missing $(srcdir)/configure \
$(srcdir)/GNUmakefile.in $(srcdir)/INSTALL $(srcdir)/README \
$(top_builddir)/config.*
- DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
+ DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile \
+ doltlibtool WebKit/gtk/docs/version.xml \
+ WebKit/gtk/docs/GNUmakefile $(MOFILES)
# Clean rules for JavaScriptCore
@@@ -7559,6 -7623,7 +7625,7 @@@
# Project-wide clean rules
CLEANFILES := $(stamp_files) $(BUILT_SOURCES) \
+ WebKit/gtk/docs/GNUmakefile \
JavaScriptCore/runtime/ArrayPrototype.lut.h \
JavaScriptCore/runtime/DatePrototype.lut.h \
JavaScriptCore/runtime/MathObject.lut.h \
@@@ -7721,7 -7786,8 +7788,8 @@@ Programs_GtkLauncher_CFLAGS =
Programs_GtkLauncher_LDADD = \
libwebkit-1.0.la \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(GLIB_LIBS)
# DumpRenderTree
@@@ -7753,11 -7819,13 +7821,13 @@@ Programs_DumpRenderTree_SOURCES =
Programs_DumpRenderTree_CXXFLAGS = \
$(global_cxxflags) \
+ $(dumprendertree_cppflags) \
$(Programs_DumpRenderTree_CFLAGS)
Programs_DumpRenderTree_CFLAGS = \
-fno-strict-aliasing \
-O2 \
+ $(dumprendertree_cppflags) \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS) \
$(CAIRO_CFLAGS) \
@@@ -7768,7 -7836,9 +7838,9 @@@ Programs_DumpRenderTree_LDADD =
libwebkit-1.0.la \
$(GLOBALDEPS_LIBS) \
$(CAIRO_LIBS) \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBSOUP_LIBS)
@TARGET_X11_TRUE at TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
@TARGET_X11_TRUE@ -I$(srcdir)/WebKitTools/DumpRenderTree \
@@@ -7796,6 -7866,11 +7868,11 @@@
@TARGET_X11_TRUE@ -avoid-version \
@TARGET_X11_TRUE@ -module
+ DOMAIN := $(GETTEXT_PACKAGE)
+ MSGFMT := $(shell which msgfmt)
+ XGETTEXT := $(shell which xgettext)
+ MSGMERGE := $(shell which msgmerge)
+ MSGMERGE_UPDATE := $(MSGMERGE) --update
webkit_tests_cflags = \
-fno-strict-aliasing \
-O2 \
@@@ -7824,6 -7899,9 +7901,9 @@@ Programs_unittests_testwebbackforwardli
Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
+ Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
+ Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
+ Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
# Autogenerated sources
BUILT_SOURCES := \
@@@ -7838,10 -7916,10 +7918,10 @@@ all: $(BUILT_SOURCES) autotoolsconfig.
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .mo .nop .o .obj .po .po-create
am--refresh:
@:
- $(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(srcdir)/JavaScriptCore/GNUmakefile.am $(srcdir)/WebCore/GNUmakefile.am $(srcdir)/WebKitTools/GNUmakefile.am $(am__configure_deps)
+ $(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(srcdir)/JavaScriptCore/GNUmakefile.am $(srcdir)/WebCore/GNUmakefile.am $(srcdir)/WebKitTools/GNUmakefile.am $(srcdir)/WebKit/gtk/po/GNUmakefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@@ -8550,6 -8628,9 +8630,9 @@@ WebCore/bindings/js/libWebCore_la-JSCli
WebCore/bindings/js/libWebCore_la-JSConsoleCustom.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
+ WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.lo: \
+ WebCore/bindings/js/$(am__dirstamp) \
+ WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
@@@ -8781,6 -8862,9 +8864,9 @@@ WebCore/bindings/js/libWebCore_la-Scrip
WebCore/bindings/js/libWebCore_la-ScriptObjectQuarantine.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
+ WebCore/bindings/js/libWebCore_la-ScriptState.lo: \
+ WebCore/bindings/js/$(am__dirstamp) \
+ WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
WebCore/bindings/js/libWebCore_la-ScriptValue.lo: \
WebCore/bindings/js/$(am__dirstamp) \
WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
@@@ -12190,12 -12274,18 +12276,18 @@@ WebKit/gtk/tests/$(am__dirstamp)
WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) WebKit/gtk/tests/$(DEPDIR)
@: > WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
- WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT): \
+ WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.$(OBJEXT): \
WebKit/gtk/tests/$(am__dirstamp) \
WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
Programs/unittests/$(am__dirstamp):
@$(MKDIR_P) Programs/unittests
@: > Programs/unittests/$(am__dirstamp)
+ Programs/unittests/testdownload$(EXEEXT): $(Programs_unittests_testdownload_OBJECTS) $(Programs_unittests_testdownload_DEPENDENCIES) Programs/unittests/$(am__dirstamp)
+ @rm -f Programs/unittests/testdownload$(EXEEXT)
+ $(Programs_unittests_testdownload_LINK) $(Programs_unittests_testdownload_OBJECTS) $(Programs_unittests_testdownload_LDADD) $(LIBS)
+ WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT): \
+ WebKit/gtk/tests/$(am__dirstamp) \
+ WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
Programs/unittests/testwebbackforwardlist$(EXEEXT): $(Programs_unittests_testwebbackforwardlist_OBJECTS) $(Programs_unittests_testwebbackforwardlist_DEPENDENCIES) Programs/unittests/$(am__dirstamp)
@rm -f Programs/unittests/testwebbackforwardlist$(EXEEXT)
$(Programs_unittests_testwebbackforwardlist_LINK) $(Programs_unittests_testwebbackforwardlist_OBJECTS) $(Programs_unittests_testwebbackforwardlist_LDADD) $(LIBS)
@@@ -12566,6 -12656,8 +12658,8 @@@ mostlyclean-compile
-rm -f WebCore/bindings/js/libWebCore_la-JSClipboardCustom.lo
-rm -f WebCore/bindings/js/libWebCore_la-JSConsoleCustom.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-JSConsoleCustom.lo
+ -rm -f WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.$(OBJEXT)
+ -rm -f WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.lo
-rm -f WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.lo
-rm -f WebCore/bindings/js/libWebCore_la-JSCustomPositionErrorCallback.$(OBJEXT)
@@@ -12762,6 -12854,8 +12856,8 @@@
-rm -f WebCore/bindings/js/libWebCore_la-ScriptObject.lo
-rm -f WebCore/bindings/js/libWebCore_la-ScriptObjectQuarantine.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-ScriptObjectQuarantine.lo
+ -rm -f WebCore/bindings/js/libWebCore_la-ScriptState.$(OBJEXT)
+ -rm -f WebCore/bindings/js/libWebCore_la-ScriptState.lo
-rm -f WebCore/bindings/js/libWebCore_la-ScriptValue.$(OBJEXT)
-rm -f WebCore/bindings/js/libWebCore_la-ScriptValue.lo
-rm -f WebCore/bindings/js/libWebCore_la-WorkerScriptController.$(OBJEXT)
@@@ -14702,6 -14796,7 +14798,7 @@@
-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-InspectorClientGtk.lo
-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.$(OBJEXT)
-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.lo
+ -rm -f WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.$(OBJEXT)
-rm -f WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT)
-rm -f WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.$(OBJEXT)
-rm -f WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.$(OBJEXT)
@@@ -14930,6 -15025,7 +15027,7 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCanvasRenderingContext2DCustom.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSClipboardCustom.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSConsoleCustom.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCoordinatesCustom.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomPositionCallback.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomPositionErrorCallback.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomSQLStatementCallback.Plo at am__quote@
@@@ -15028,6 -15124,7 +15126,7 @@@
@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@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptState.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptValue.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-WorkerScriptController.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/bridge/$(DEPDIR)/libWebCore_la-IdentifierRep.Plo at am__quote@
@@@ -15998,6 -16095,7 +16097,7 @@@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-FrameLoaderClientGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-InspectorClientGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-PasteboardHelperGtk.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Po at am__quote@
@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@
@@@ -16184,6 -16282,20 +16284,20 @@@ JavaScriptCore/API/tests/Programs_minid
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_minidom_CPPFLAGS) $(CPPFLAGS) $(Programs_minidom_CFLAGS) $(CFLAGS) -c -o JavaScriptCore/API/tests/Programs_minidom-minidom.obj `if test -f 'JavaScriptCore/API/tests/minidom.c'; then $(CYGPATH_W) 'JavaScriptCore/API/tests/minidom.c'; else $(CYGPATH_W) '$(srcdir)/JavaScriptCore/API/tests/minidom.c'; fi`
+ WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.o: WebKit/gtk/tests/testdownload.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testdownload_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.o `test -f 'WebKit/gtk/tests/testdownload.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testdownload.c
+ @am__fastdepCC_TRUE@ mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='WebKit/gtk/tests/testdownload.c' object='WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testdownload_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.o `test -f 'WebKit/gtk/tests/testdownload.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testdownload.c
+
+ WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.obj: WebKit/gtk/tests/testdownload.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testdownload_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.obj -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.obj `if test -f 'WebKit/gtk/tests/testdownload.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testdownload.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testdownload.c'; fi`
+ @am__fastdepCC_TRUE@ mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testdownload-testdownload.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='WebKit/gtk/tests/testdownload.c' object='WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testdownload_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testdownload-testdownload.obj `if test -f 'WebKit/gtk/tests/testdownload.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testdownload.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testdownload.c'; fi`
+
WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o: WebKit/gtk/tests/testwebbackforwardlist.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o `test -f 'WebKit/gtk/tests/testwebbackforwardlist.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebbackforwardlist.c
@am__fastdepCC_TRUE@ mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Po
@@@ -17335,6 -17447,13 +17449,13 @@@ WebCore/bindings/js/libWebCore_la-JSCon
@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-JSConsoleCustom.lo `test -f 'WebCore/bindings/js/JSConsoleCustom.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSConsoleCustom.cpp
+ WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.lo: WebCore/bindings/js/JSCoordinatesCustom.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-JSCoordinatesCustom.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCoordinatesCustom.Tpo -c -o WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.lo `test -f 'WebCore/bindings/js/JSCoordinatesCustom.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSCoordinatesCustom.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCoordinatesCustom.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCoordinatesCustom.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/bindings/js/JSCoordinatesCustom.cpp' object='WebCore/bindings/js/libWebCore_la-JSCoordinatesCustom.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-JSCoordinatesCustom.lo `test -f 'WebCore/bindings/js/JSCoordinatesCustom.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSCoordinatesCustom.cpp
+
WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.lo: WebCore/bindings/js/JSCustomPositionCallback.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-JSCustomPositionCallback.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomPositionCallback.Tpo -c -o WebCore/bindings/js/libWebCore_la-JSCustomPositionCallback.lo `test -f 'WebCore/bindings/js/JSCustomPositionCallback.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSCustomPositionCallback.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomPositionCallback.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSCustomPositionCallback.Plo
@@@ -17874,6 -17993,13 +17995,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-ScriptObjectQuarantine.lo `test -f 'WebCore/bindings/js/ScriptObjectQuarantine.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptObjectQuarantine.cpp
+ WebCore/bindings/js/libWebCore_la-ScriptState.lo: WebCore/bindings/js/ScriptState.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-ScriptState.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptState.Tpo -c -o WebCore/bindings/js/libWebCore_la-ScriptState.lo `test -f 'WebCore/bindings/js/ScriptState.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptState.cpp
+ @am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptState.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptState.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/bindings/js/ScriptState.cpp' object='WebCore/bindings/js/libWebCore_la-ScriptState.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-ScriptState.lo `test -f 'WebCore/bindings/js/ScriptState.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptState.cpp
+
WebCore/bindings/js/libWebCore_la-ScriptValue.lo: WebCore/bindings/js/ScriptValue.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-ScriptValue.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptValue.Tpo -c -o WebCore/bindings/js/libWebCore_la-ScriptValue.lo `test -f 'WebCore/bindings/js/ScriptValue.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/ScriptValue.cpp
@am__fastdepCXX_TRUE@ mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptValue.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-ScriptValue.Plo
@@@ -25198,7 -25324,7 +25326,7 @@@ clean-libtool
-rm -rf WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/.libs WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/_libs
distclean-libtool:
- -rm -f libtool
+ -rm -f libtool config.lt
install-dist_webinspectorDATA: $(dist_webinspector_DATA)
@$(NORMAL_INSTALL)
test -z "$(webinspectordir)" || $(MKDIR_P) "$(DESTDIR)$(webinspectordir)"
@@@ -25290,7 -25416,7 +25418,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; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@@ -25677,7 -25803,7 +25805,7 @@@ info: info-a
info-am:
- install-data-am: install-dist_webinspectorDATA \
+ install-data-am: install-data-local install-dist_webinspectorDATA \
install-dist_webinspectorimagesDATA \
install-libJavaScriptCore_laHEADERS \
install-libwebkit_1_0_laHEADERS install-pkgconfigDATA
@@@ -25724,7 -25850,7 +25852,7 @@@ uninstall-am: uninstall-binPROGRAMS uni
uninstall-dist_webinspectorimagesDATA \
uninstall-libJavaScriptCore_laHEADERS uninstall-libLIBRARIES \
uninstall-libLTLIBRARIES uninstall-libwebkit_1_0_laHEADERS \
- uninstall-pkgconfigDATA
+ uninstall-local uninstall-pkgconfigDATA
.MAKE: install-am install-strip
@@@ -25738,7 -25864,8 +25866,8 @@@
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-dist_webinspectorDATA \
+ install-data-am install-data-local \
+ install-dist_webinspectorDATA \
install-dist_webinspectorimagesDATA install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am \
@@@ -25754,7 -25881,7 +25883,7 @@@
uninstall-dist_webinspectorimagesDATA \
uninstall-libJavaScriptCore_laHEADERS uninstall-libLIBRARIES \
uninstall-libLTLIBRARIES uninstall-libwebkit_1_0_laHEADERS \
- uninstall-pkgconfigDATA
+ uninstall-local uninstall-pkgconfigDATA
$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
@@@ -25960,10 -26087,180 +26089,180 @@@ $(libWebCoreJS_objects): AM_CXXFLAGS+=$
libWebCoreJS.la: $(libWebCoreJS_objects)
$(CXXLINK) $(libWebCoreJS_objects) $(LIBS)
+ .po.mo:
+ test -d WebKit/gtk/po/ || mkdir -p WebKit/gtk/po/
+ @echo "$(MSGFMT) -c -o $@ $<"; \
+ $(MSGFMT) -c -o $@ $<
+
+ # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+ # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+ # we don't want to bother translators with empty POT files). We assume that
+ # LINGUAS is empty in this case, i.e. $(POFILES) and $(MOFILES) are empty.
+ # In this case, stamp-po is a nop (i.e. a phony target).
+
+ # stamp-po is a timestamp denoting the last time at which the CATALOGS have
+ # been loosely updated. Its purpose is that when a developer or translator
+ # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+ # "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+ # invocations of "make" will do nothing. This timestamp would not be necessary
+ # if updating the $(CATALOGS) would always touch them; however, the rule for
+ # $(POFILES) has been designed to not touch files that don't need to be
+ # changed.
+ stamp-po: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot $(MOFILES)
+ test ! -f $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot || \
+ test -z "$(MOFILES)" || $(MAKE) $(MOFILES)
+ @test ! -f $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot || { \
+ echo "touch stamp-po" && \
+ echo timestamp > stamp-poT && \
+ mv stamp-poT stamp-po; \
+ }
+
+ # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+ # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/WebKit/gtk/po/POTFILES
+ package_gnu=''; \
+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+ else \
+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+ fi; \
+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ --files-from=$(srcdir)/WebKit/gtk/po/POTFILES \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/webkit.pot \
+ ;; \
+ *) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ --files-from=$(srcdir)/WebKit/gtk/po/POTFILES \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --package-name="$${package_gnu}@PACKAGE@" \
+ --package-version='@VERSION@' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/webkit.pot \
+ ;; \
+ esac
+
+ # This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+ # every "make" invocation, only create it when it is missing.
+ # Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+ $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot:
+ $(MAKE) $(DOMAIN).pot-update
+
+ # This target rebuilds a PO file if $(DOMAIN).pot has changed.
+ # Note that a PO file is not touched if it doesn't need to be changed.
+ $(POFILES): $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+
+ update-po: GNUmakefile
+ $(MAKE) $(DOMAIN).pot-update
+ $(MAKE) $(POFILES)
+ $(MAKE) $(MOFILES)
+
+ .nop.po-create:
+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+ exit 1
+
+ po-install-data-local: all
+ $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(MOFILES)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+ if test -r WebKit/gtk/po/$$cat; then realcat=WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+ fi; \
+ done; \
+ done
+
+ po-installdirs-data-local:
+ $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(MOFILES)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ fi; \
+ done; \
+ done
+
+ po-uninstall-local:
+ catalogs='$(MOFILES)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ done; \
+ done
+
# Older automake versions (1.7) place Plo files in a different place so we need
# to create the output directory manually.
- all-local:
- mkdir -p $(top_builddir)/$(DEPDIR)/DerivedSources
+ all-local: stamp-po
+ $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
# remove built sources and program directories
clean-local:
@@@ -25973,6 -26270,12 +26272,12 @@@ maintainer-clean-local: distclean-loca
distclean-local:
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
+
+ install-data-local: po-install-data-local
+
+ installdirs-data-local: po-installdirs-data-local
+
+ uninstall-local: po-uninstall-local
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --combined JavaScriptCore/GNUmakefile.am
index 91fca70,1c84d9a..51c8ae0
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@@ -13,6 -13,7 +13,7 @@@ javascriptcore_cppflags +=
-I$(srcdir)/JavaScriptCore/jit \
-I$(srcdir)/JavaScriptCore/assembler \
-I$(srcdir)/JavaScriptCore/wtf/unicode \
+ -I$(srcdir)/JavaScriptCore/yarr \
-I$(top_builddir)/JavaScriptCore/pcre \
-I$(top_builddir)/JavaScriptCore/parser \
-I$(top_builddir)/JavaScriptCore/runtime
@@@ -137,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 \
@@@ -268,7 -268,12 +269,12 @@@
JavaScriptCore/wtf/unicode/UTF8.h \
JavaScriptCore/wtf/unicode/Unicode.h \
JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
- JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
+ JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h \
+ JavaScriptCore/yarr/RegexCompiler.h \
+ JavaScriptCore/yarr/RegexInterpreter.h \
+ JavaScriptCore/yarr/RegexJIT.h \
+ JavaScriptCore/yarr/RegexParser.h \
+ JavaScriptCore/yarr/RegexPattern.h
# Debug build
if ENABLE_DEBUG
@@@ -430,6 -435,7 +436,7 @@@ javascriptcore_sources +=
JavaScriptCore/runtime/Tracing.h \
JavaScriptCore/runtime/UString.cpp \
JavaScriptCore/runtime/UString.h \
+ JavaScriptCore/wtf/FastAllocBase.h \
JavaScriptCore/wtf/FastMalloc.cpp \
JavaScriptCore/wtf/FastMalloc.h \
JavaScriptCore/wtf/MallocZoneSupport.h \
diff --combined JavaScriptCore/jit/JITStubs.h
index 1bf55e7,f39c4c8..47a3926
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@@ -73,7 -73,8 +73,7 @@@ namespace JSC
#endif
#endif
-// The Mac compilers are fine with this,
-#if PLATFORM(MAC)
+#if PLATFORM(X86_64)
struct VoidPtrPair {
void* first;
void* second;
@@@ -169,6 -170,7 +169,7 @@@
static int JIT_STUB cti_op_loop_if_less(STUB_ARGS);
static int JIT_STUB cti_op_loop_if_lesseq(STUB_ARGS);
static int JIT_STUB cti_op_loop_if_true(STUB_ARGS);
+ static int JIT_STUB cti_op_load_varargs(STUB_ARGS);
static int JIT_STUB cti_timeout_check(STUB_ARGS);
static void JIT_STUB cti_op_create_arguments(STUB_ARGS);
static void JIT_STUB cti_op_create_arguments_no_params(STUB_ARGS);
diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index 60e8cba,f114160..c8c3427
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -78,6 -78,7 +78,7 @@@
#include "FastMalloc.h"
#include "Assertions.h"
+ #include <limits>
#if ENABLE(JSC_MULTIPLE_THREADS)
#include <pthread.h>
#endif
@@@ -151,6 -152,19 +152,19 @@@ void fastMallocAllow(
namespace WTF {
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+
+ namespace Internal {
+
+ void fastMallocMatchFailed(void*)
+ {
+ CRASH();
+ }
+
+ } // namespace Internal
+
+ #endif
+
void* fastZeroedMalloc(size_t n)
{
void* result = fastMalloc(n);
@@@ -183,13 -197,34 +197,34 @@@ namespace WTF
void* tryFastMalloc(size_t n)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= n) // If overflow would occur...
+ return 0;
+
+ void* result = malloc(n + sizeof(AllocAlignmentInteger));
+ if (!result)
+ return 0;
+
+ *static_cast<AllocAlignmentInteger*>(result) = Internal::AllocTypeMalloc;
+ result = static_cast<AllocAlignmentInteger*>(result) + 1;
+
+ return result;
+ #else
return malloc(n);
+ #endif
}
void* fastMalloc(size_t n)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ void* result = tryFastMalloc(n);
+ #else
void* result = malloc(n);
+ #endif
+
if (!result)
CRASH();
return result;
@@@ -198,13 -233,36 +233,36 @@@
void* tryFastCalloc(size_t n_elements, size_t element_size)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ size_t totalBytes = n_elements * element_size;
+ if (n_elements > 1 && element_size && (totalBytes / element_size) != n_elements || (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= totalBytes))
+ return 0;
+
+ totalBytes += sizeof(AllocAlignmentInteger);
+ void* result = malloc(totalBytes);
+ if (!result)
+ return 0;
+
+ memset(result, 0, totalBytes);
+ *static_cast<AllocAlignmentInteger*>(result) = Internal::AllocTypeMalloc;
+ result = static_cast<AllocAlignmentInteger*>(result) + 1;
+ return result;
+ #else
return calloc(n_elements, element_size);
+ #endif
}
void* fastCalloc(size_t n_elements, size_t element_size)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ void* result = tryFastCalloc(n_elements, element_size);
+ #else
void* result = calloc(n_elements, element_size);
+ #endif
+
if (!result)
CRASH();
return result;
@@@ -213,19 -271,57 +271,57 @@@
void fastFree(void* p)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (!p)
+ return;
+
+ AllocAlignmentInteger* header = Internal::fastMallocMatchValidationValue(p);
+ if (*header != Internal::AllocTypeMalloc)
+ Internal::fastMallocMatchFailed(p);
+ free(header);
+ #else
free(p);
+ #endif
}
void* tryFastRealloc(void* p, size_t n)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (p) {
+ if (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= n) // If overflow would occur...
+ return 0;
+ AllocAlignmentInteger* header = Internal::fastMallocMatchValidationValue(p);
+ if (*header != Internal::AllocTypeMalloc)
+ Internal::fastMallocMatchFailed(p);
+ void* result = realloc(header, n + sizeof(AllocAlignmentInteger));
+ if (!result)
+ return 0;
+
+ // This should not be needed because the value is already there:
+ // *static_cast<AllocAlignmentInteger*>(result) = Internal::AllocTypeMalloc;
+ result = static_cast<AllocAlignmentInteger*>(result) + 1;
+ return result;
+ } else {
+ return fastMalloc(n);
+ }
+ #else
return realloc(p, n);
+ #endif
}
void* fastRealloc(void* p, size_t n)
{
ASSERT(!isForbidden());
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ void* result = tryFastRealloc(p, n);
+ #else
void* result = realloc(p, n);
+ #endif
+
if (!result)
CRASH();
return result;
@@@ -265,6 -361,7 +361,7 @@@ extern "C" const int jscore_fastmalloc_
#include "TCSystemAlloc.h"
#include <algorithm>
#include <errno.h>
+ #include <limits>
#include <new>
#include <pthread.h>
#include <stdarg.h>
@@@ -1986,13 -2083,13 +2083,13 @@@ static TCMalloc_Central_FreeListPadded
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
-static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
static bool phinited = false;
// Avoid extra level of indirection by making "pageheap" be just an alias
// of pageheap_memory.
typedef union {
- void* m_memory;
+ uint64_t* m_memory;
TCMalloc_PageHeap* m_pageHeap;
} PageHeapUnion;
@@@ -3294,7 -3391,20 +3391,20 @@@ template <bool crashOnFailure
ALWAYS_INLINE
#endif
void* malloc(size_t size) {
- void* result = do_malloc(size);
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= size) // If overflow would occur...
+ return 0;
+ size += sizeof(AllocAlignmentInteger);
+ void* result = do_malloc(size);
+ if (!result)
+ return 0;
+
+ *static_cast<AllocAlignmentInteger*>(result) = Internal::AllocTypeMalloc;
+ result = static_cast<AllocAlignmentInteger*>(result) + 1;
+ #else
+ void* result = do_malloc(size);
+ #endif
+
#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, size);
#endif
@@@ -3308,7 -3418,18 +3418,18 @@@ void free(void* ptr)
#ifndef WTF_CHANGES
MallocHook::InvokeDeleteHook(ptr);
#endif
- do_free(ptr);
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (!ptr)
+ return;
+
+ AllocAlignmentInteger* header = Internal::fastMallocMatchValidationValue(ptr);
+ if (*header != Internal::AllocTypeMalloc)
+ Internal::fastMallocMatchFailed(ptr);
+ do_free(header);
+ #else
+ do_free(ptr);
+ #endif
}
#ifndef WTF_CHANGES
@@@ -3331,16 -3452,31 +3452,31 @@@ template <bool crashOnFailure
ALWAYS_INLINE
#endif
void* calloc(size_t n, size_t elem_size) {
- const size_t totalBytes = n * elem_size;
+ size_t totalBytes = n * elem_size;
// Protect against overflow
if (n > 1 && elem_size && (totalBytes / elem_size) != n)
return 0;
-
- void* result = do_malloc(totalBytes);
- if (result != NULL) {
+
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= totalBytes) // If overflow would occur...
+ return 0;
+
+ totalBytes += sizeof(AllocAlignmentInteger);
+ void* result = do_malloc(totalBytes);
+ if (!result)
+ return 0;
+
memset(result, 0, totalBytes);
- }
+ *static_cast<AllocAlignmentInteger*>(result) = Internal::AllocTypeMalloc;
+ result = static_cast<AllocAlignmentInteger*>(result) + 1;
+ #else
+ void* result = do_malloc(totalBytes);
+ if (result != NULL) {
+ memset(result, 0, totalBytes);
+ }
+ #endif
+
#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, totalBytes);
#endif
@@@ -3381,10 -3517,14 +3517,14 @@@ ALWAYS_INLIN
#endif
void* realloc(void* old_ptr, size_t new_size) {
if (old_ptr == NULL) {
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ void* result = malloc(new_size);
+ #else
void* result = do_malloc(new_size);
#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, new_size);
#endif
+ #endif
return result;
}
if (new_size == 0) {
@@@ -3395,6 -3535,16 +3535,16 @@@
return NULL;
}
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ if (std::numeric_limits<size_t>::max() - sizeof(AllocAlignmentInteger) <= new_size) // If overflow would occur...
+ return 0;
+ new_size += sizeof(AllocAlignmentInteger);
+ AllocAlignmentInteger* header = Internal::fastMallocMatchValidationValue(old_ptr);
+ if (*header != Internal::AllocTypeMalloc)
+ Internal::fastMallocMatchFailed(old_ptr);
+ old_ptr = header;
+ #endif
+
// Get the size of the old entry
const PageID p = reinterpret_cast<uintptr_t>(old_ptr) >> kPageShift;
size_t cl = pageheap->GetSizeClassIfCached(p);
@@@ -3431,8 -3581,14 +3581,14 @@@
// that we already know the sizeclass of old_ptr. The benefit
// would be small, so don't bother.
do_free(old_ptr);
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ new_ptr = static_cast<AllocAlignmentInteger*>(new_ptr) + 1;
+ #endif
return new_ptr;
} else {
+ #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
+ old_ptr = pByte + sizeof(AllocAlignmentInteger); // Set old_ptr back to the user pointer.
+ #endif
return old_ptr;
}
}
diff --combined JavaScriptCore/wtf/Platform.h
index d540505,77a8b8f..560fec8
--- 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) */
@@@ -341,6 -324,7 +341,7 @@@
#endif
#if PLATFORM(WX)
+ #define ENABLE_ASSEMBLER 1
#define WTF_USE_CURL 1
#define WTF_USE_PTHREADS 1
#endif
@@@ -416,6 -400,12 +417,12 @@@
/* ENABLE macro defaults */
+ /* fastMalloc match validation allows for runtime verification that
+ new is matched by delete, fastMalloc is matched by fastFree, etc. */
+ #if !defined(ENABLE_FAST_MALLOC_MATCH_VALIDATION)
+ #define ENABLE_FAST_MALLOC_MATCH_VALIDATION 0
+ #endif
+
#if !defined(ENABLE_ICONDATABASE)
#define ENABLE_ICONDATABASE 1
#endif
@@@ -516,6 -506,13 +523,13 @@@
#define ENABLE_WREC 1
#endif
+ /* Yet Another Regex Runtime. */
+ #define ENABLE_YARR 0
+ #define ENABLE_YARR_JIT 0
+ #if ENABLE(YARR_JIT) && !ENABLE(YARR)
+ #error "YARR_JIT requires YARR"
+ #endif
+
#if ENABLE(JIT) || ENABLE(WREC)
#define ENABLE_ASSEMBLER 1
#endif
diff --combined autotoolsconfig.h.in
index faecd17,8a1e654..5e9897b
--- a/autotoolsconfig.h.in
+++ b/autotoolsconfig.h.in
@@@ -15,6 -15,9 +15,9 @@@
/* Define to enable WREC */
#undef ENABLE_WREC
+ /* The gettext catalog name */
+ #undef GETTEXT_PACKAGE
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@@ -94,12 -97,6 +97,12 @@@
/* Define if target is X11 */
#undef WTF_PLATFORM_X11
+/* Use alternate JSImmediate */
+#undef WTF_USE_ALTERNATE_JSIMMEDIATE
+
+/* Use stub register */
+#undef WTF_USE_JIT_STUB_ARGUMENT_REGISTER
+
/* Use stub va_list */
#undef WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
diff --combined configure
index e1f6b22,b6e6d5b..08d9eb4
--- a/configure
+++ b/configure
@@@ -1,11 -1,11 +1,11 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for WebKit 1.1.4.
+ # Generated by GNU Autoconf 2.63 for WebKit 1.1.5.
#
# Report bugs to <http://bugs.webkit.org/>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@@ -17,7 -17,7 +17,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@@ -39,17 -39,45 +39,45 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+ as_nl='
+ '
+ export as_nl
+ # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+ else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+ fi
+
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@@ -65,8 -93,6 +93,6 @@@ f
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
- as_nl='
- '
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@@ -89,7 -115,7 +115,7 @@@ if test "x$as_myself" = x; the
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@@ -102,17 -128,10 +128,10 @@@ PS2='>
PS4='+ '
# NLS nuisances.
- for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
- do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
+ LC_ALL=C
+ export LC_ALL
+ LANGUAGE=C
+ export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -134,7 -153,7 +153,7 @@@ as_me=`$as_basename -- "$0" |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
+ $as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@@ -160,7 -179,7 +179,7 @@@ els
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@@ -242,7 -261,7 +261,7 @@@ IFS=$as_save_IF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@@ -263,7 -282,7 +282,7 @@@ _ASEO
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@@ -343,10 -362,10 +362,10 @@@ f
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@@ -415,9 -434,10 +434,10 @@@ f
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@@ -453,7 -473,7 +473,7 @@@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@@ -481,7 -501,6 +501,6 @@@ case `echo -n x` i
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@@ -494,19 -513,22 +513,22 @@@ if test -d conf$$.dir; the
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
- fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+ fi
+ if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@@ -531,10 -553,10 +553,10 @@@ els
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@@ -723,8 -745,8 +745,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='WebKit'
PACKAGE_TARNAME='webkit'
- PACKAGE_VERSION='1.1.4'
- PACKAGE_STRING='WebKit 1.1.4'
+ PACKAGE_VERSION='1.1.5'
+ PACKAGE_STRING='WebKit 1.1.5'
PACKAGE_BUGREPORT='http://bugs.webkit.org/'
ac_unique_file="WebCore/config.h"
@@@ -764,253 -786,304 +786,304 @@@ ac_includes_default="
# include <unistd.h>
#endif"
- ac_subst_vars='SHELL
- PATH_SEPARATOR
- PACKAGE_NAME
- PACKAGE_TARNAME
- PACKAGE_VERSION
- PACKAGE_STRING
- PACKAGE_BUGREPORT
- exec_prefix
- prefix
- program_transform_name
- bindir
- sbindir
- libexecdir
- datarootdir
- datadir
- sysconfdir
- sharedstatedir
- localstatedir
- includedir
- oldincludedir
- docdir
- infodir
- htmldir
- dvidir
- pdfdir
- psdir
- libdir
- localedir
- mandir
- DEFS
- ECHO_C
- ECHO_N
- ECHO_T
- LIBS
- build_alias
- host_alias
- target_alias
- ACLOCAL_AMFLAGS
- build
- build_cpu
- build_vendor
- build_os
- host
- host_cpu
- host_vendor
- host_os
- target
- target_cpu
- target_vendor
- target_os
- WEBKIT_MAJOR_VERSION
- WEBKIT_MINOR_VERSION
- WEBKIT_MICRO_VERSION
- LIBWEBKITGTK_VERSION
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
- am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
- ACLOCAL
- AUTOCONF
- AUTOMAKE
- AUTOHEADER
- MAKEINFO
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
- mkdir_p
- AWK
- SET_MAKE
- am__leading_dot
- AMTAR
- am__tar
- am__untar
- CC
- CFLAGS
- LDFLAGS
- CPPFLAGS
- ac_ct_CC
- EXEEXT
- OBJEXT
- DEPDIR
- am__include
- am__quote
- AMDEP_TRUE
- AMDEP_FALSE
- AMDEPBACKSLASH
- CCDEPMODE
- am__fastdepCC_TRUE
- am__fastdepCC_FALSE
- SYMBOL_VISIBILITY
- SYMBOL_VISIBILITY_INLINES
- PKG_CONFIG
- PERL
- BISON
- MV
- CXX
- CXXFLAGS
- ac_ct_CXX
- CXXDEPMODE
- am__fastdepCXX_TRUE
- am__fastdepCXX_FALSE
- CPP
- GREP
- EGREP
- AS
- DLLTOOL
- OBJDUMP
- LIBTOOL
- SED
- FGREP
- LD
- DUMPBIN
- ac_ct_DUMPBIN
- NM
- LN_S
- AR
- RANLIB
- lt_ECHO
- DSYMUTIL
- NMEDIT
- LIPO
- OTOOL
- OTOOL64
- CXXCPP
- DOLT_BASH
- LTCOMPILE
- LTCXXCOMPILE
- FLEX
- GPERF
- JPEG_LIBS
- PNG_LIBS
- HILDON_CFLAGS
- HILDON_LIBS
- HILDON_CPPFLAGS
- GLIB_CFLAGS
- GLIB_LIBS
- GLIB_GENMARSHAL
- GLIB_MKENUMS
- icu_config
- UNICODE_CFLAGS
- UNICODE_LIBS
- LIBXML_CFLAGS
- LIBXML_LIBS
- PANGO_CFLAGS
- PANGO_LIBS
- CAIRO_CFLAGS
- CAIRO_LIBS
- GTK_CFLAGS
- GTK_LIBS
- XT_CFLAGS
- XT_LIBS
- LIBSOUP_CFLAGS
- LIBSOUP_LIBS
- GNOMEKEYRING_CFLAGS
- GNOMEKEYRING_LIBS
- FREETYPE_CFLAGS
- FREETYPE_LIBS
- SQLITE3_CFLAGS
- SQLITE3_LIBS
- LIBXSLT_CFLAGS
- LIBXSLT_LIBS
- GEOCLUE_CFLAGS
- GEOCLUE_LIBS
- GSTREAMER_CFLAGS
- GSTREAMER_LIBS
- COVERAGE_CFLAGS
- COVERAGE_LDFLAGS
- OS_WIN32_TRUE
- OS_WIN32_FALSE
- OS_UNIX_TRUE
- OS_UNIX_FALSE
- OS_LINUX_TRUE
- OS_LINUX_FALSE
- OS_GNU_TRUE
- OS_GNU_FALSE
- OS_FREEBSD_TRUE
- OS_FREEBSD_FALSE
- TARGET_X11_TRUE
- TARGET_X11_FALSE
- TARGET_WIN32_TRUE
- TARGET_WIN32_FALSE
- TARGET_QUARTZ_TRUE
- TARGET_QUARTZ_FALSE
- TARGET_DIRECTFB_TRUE
- TARGET_DIRECTFB_FALSE
- USE_GNOMEKEYRING_TRUE
- USE_GNOMEKEYRING_FALSE
- USE_FREETYPE_TRUE
- USE_FREETYPE_FALSE
- USE_PANGO_TRUE
- USE_PANGO_FALSE
- ENABLE_DEBUG_TRUE
- ENABLE_DEBUG_FALSE
- ENABLE_DASHBOARD_SUPPORT_TRUE
- ENABLE_DASHBOARD_SUPPORT_FALSE
- ENABLE_3D_TRANSFORMS_TRUE
- ENABLE_3D_TRANSFORMS_FALSE
- ENABLE_CHANNEL_MESSAGING_TRUE
- ENABLE_CHANNEL_MESSAGING_FALSE
- ENABLE_OFFLINE_WEB_APPLICATIONS_TRUE
- ENABLE_OFFLINE_WEB_APPLICATIONS_FALSE
- ENABLE_DOM_STORAGE_TRUE
- ENABLE_DOM_STORAGE_FALSE
- ENABLE_DATABASE_TRUE
- ENABLE_DATABASE_FALSE
- ENABLE_ICONDATABASE_TRUE
- ENABLE_ICONDATABASE_FALSE
- ENABLE_XPATH_TRUE
- ENABLE_XPATH_FALSE
- ENABLE_XSLT_TRUE
- ENABLE_XSLT_FALSE
- ENABLE_GEOLOCATION_TRUE
- ENABLE_GEOLOCATION_FALSE
- ENABLE_VIDEO_TRUE
- ENABLE_VIDEO_FALSE
- ENABLE_SVG_TRUE
- ENABLE_SVG_FALSE
- ENABLE_SVG_ANIMATION_TRUE
- ENABLE_SVG_ANIMATION_FALSE
- ENABLE_SVG_FILTERS_TRUE
- ENABLE_SVG_FILTERS_FALSE
- ENABLE_SVG_FONTS_TRUE
- ENABLE_SVG_FONTS_FALSE
- ENABLE_SVG_FOREIGN_OBJECT_TRUE
- ENABLE_SVG_FOREIGN_OBJECT_FALSE
- ENABLE_SVG_AS_IMAGE_TRUE
- ENABLE_SVG_AS_IMAGE_FALSE
- ENABLE_SVG_USE_TRUE
- ENABLE_SVG_USE_FALSE
- ENABLE_COVERAGE_TRUE
- ENABLE_COVERAGE_FALSE
- ENABLE_FAST_MALLOC_TRUE
- ENABLE_FAST_MALLOC_FALSE
- ENABLE_WML_TRUE
- ENABLE_WML_FALSE
- ENABLE_WORKERS_TRUE
- ENABLE_WORKERS_FALSE
- SVG_FLAGS_TRUE
- SVG_FLAGS_FALSE
- HTML_FLAGS_TRUE
- HTML_FLAGS_FALSE
+ ac_subst_vars='LTLIBOBJS
LIBOBJS
- LTLIBOBJS'
+ HTML_FLAGS_FALSE
+ HTML_FLAGS_TRUE
+ SVG_FLAGS_FALSE
+ SVG_FLAGS_TRUE
+ ENABLE_WORKERS_FALSE
+ ENABLE_WORKERS_TRUE
+ ENABLE_WML_FALSE
+ ENABLE_WML_TRUE
+ ENABLE_FAST_MALLOC_FALSE
+ ENABLE_FAST_MALLOC_TRUE
+ ENABLE_COVERAGE_FALSE
+ ENABLE_COVERAGE_TRUE
+ ENABLE_SVG_USE_FALSE
+ ENABLE_SVG_USE_TRUE
+ ENABLE_SVG_AS_IMAGE_FALSE
+ ENABLE_SVG_AS_IMAGE_TRUE
+ ENABLE_SVG_FOREIGN_OBJECT_FALSE
+ ENABLE_SVG_FOREIGN_OBJECT_TRUE
+ ENABLE_SVG_FONTS_FALSE
+ ENABLE_SVG_FONTS_TRUE
+ ENABLE_SVG_FILTERS_FALSE
+ ENABLE_SVG_FILTERS_TRUE
+ ENABLE_SVG_ANIMATION_FALSE
+ ENABLE_SVG_ANIMATION_TRUE
+ ENABLE_SVG_FALSE
+ ENABLE_SVG_TRUE
+ ENABLE_VIDEO_FALSE
+ ENABLE_VIDEO_TRUE
+ ENABLE_GEOLOCATION_FALSE
+ ENABLE_GEOLOCATION_TRUE
+ ENABLE_XSLT_FALSE
+ ENABLE_XSLT_TRUE
+ ENABLE_XPATH_FALSE
+ ENABLE_XPATH_TRUE
+ ENABLE_ICONDATABASE_FALSE
+ ENABLE_ICONDATABASE_TRUE
+ ENABLE_DATABASE_FALSE
+ ENABLE_DATABASE_TRUE
+ ENABLE_DOM_STORAGE_FALSE
+ ENABLE_DOM_STORAGE_TRUE
+ ENABLE_OFFLINE_WEB_APPLICATIONS_FALSE
+ ENABLE_OFFLINE_WEB_APPLICATIONS_TRUE
+ ENABLE_CHANNEL_MESSAGING_FALSE
+ ENABLE_CHANNEL_MESSAGING_TRUE
+ ENABLE_3D_TRANSFORMS_FALSE
+ ENABLE_3D_TRANSFORMS_TRUE
+ ENABLE_DASHBOARD_SUPPORT_FALSE
+ ENABLE_DASHBOARD_SUPPORT_TRUE
+ ENABLE_DEBUG_FALSE
+ ENABLE_DEBUG_TRUE
+ USE_PANGO_FALSE
+ USE_PANGO_TRUE
+ USE_FREETYPE_FALSE
+ USE_FREETYPE_TRUE
+ USE_GNOMEKEYRING_FALSE
+ USE_GNOMEKEYRING_TRUE
+ TARGET_DIRECTFB_FALSE
+ TARGET_DIRECTFB_TRUE
+ TARGET_QUARTZ_FALSE
+ TARGET_QUARTZ_TRUE
+ TARGET_WIN32_FALSE
+ TARGET_WIN32_TRUE
+ TARGET_X11_FALSE
+ TARGET_X11_TRUE
+ OS_FREEBSD_FALSE
+ OS_FREEBSD_TRUE
+ OS_GNU_FALSE
+ OS_GNU_TRUE
+ OS_LINUX_FALSE
+ OS_LINUX_TRUE
+ OS_UNIX_FALSE
+ OS_UNIX_TRUE
+ OS_WIN32_FALSE
+ OS_WIN32_TRUE
+ GTK_DOC_USE_LIBTOOL_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
+ ENABLE_GTK_DOC_FALSE
+ ENABLE_GTK_DOC_TRUE
+ GTKDOC_CHECK
+ HTML_DIR
+ COVERAGE_LDFLAGS
+ COVERAGE_CFLAGS
+ GSTREAMER_LIBS
+ GSTREAMER_CFLAGS
+ GEOCLUE_LIBS
+ GEOCLUE_CFLAGS
+ LIBXSLT_LIBS
+ LIBXSLT_CFLAGS
+ SQLITE3_LIBS
+ SQLITE3_CFLAGS
+ FREETYPE_LIBS
+ FREETYPE_CFLAGS
+ GNOMEKEYRING_LIBS
+ GNOMEKEYRING_CFLAGS
+ LIBSOUP_LIBS
+ LIBSOUP_CFLAGS
+ XT_LIBS
+ XT_CFLAGS
+ GTK_LIBS
+ GTK_CFLAGS
+ CAIRO_LIBS
+ CAIRO_CFLAGS
+ PANGO_LIBS
+ PANGO_CFLAGS
+ LIBXML_LIBS
+ LIBXML_CFLAGS
+ GETTEXT_PACKAGE
+ UNICODE_LIBS
+ UNICODE_CFLAGS
+ icu_config
+ GLIB_MKENUMS
+ GLIB_GENMARSHAL
+ GLIB_LIBS
+ GLIB_CFLAGS
+ HILDON_CPPFLAGS
+ HILDON_LIBS
+ HILDON_CFLAGS
+ PNG_LIBS
+ JPEG_LIBS
+ GPERF
+ FLEX
+ LTCXXCOMPILE
+ LTCOMPILE
+ DOLT_BASH
+ CXXCPP
+ OTOOL64
+ OTOOL
+ LIPO
+ NMEDIT
+ DSYMUTIL
+ lt_ECHO
+ RANLIB
+ AR
+ LN_S
+ NM
+ ac_ct_DUMPBIN
+ DUMPBIN
+ LD
+ FGREP
+ SED
+ LIBTOOL
+ OBJDUMP
+ DLLTOOL
+ AS
+ EGREP
+ GREP
+ CPP
+ am__fastdepCXX_FALSE
+ am__fastdepCXX_TRUE
+ CXXDEPMODE
+ ac_ct_CXX
+ CXXFLAGS
+ CXX
+ MV
+ BISON
+ PERL
+ PKG_CONFIG
+ SYMBOL_VISIBILITY_INLINES
+ SYMBOL_VISIBILITY
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+ am__quote
+ am__include
+ DEPDIR
+ OBJEXT
+ EXEEXT
+ ac_ct_CC
+ CPPFLAGS
+ LDFLAGS
+ CFLAGS
+ CC
+ am__untar
+ am__tar
+ AMTAR
+ am__leading_dot
+ SET_MAKE
+ AWK
+ mkdir_p
+ MKDIR_P
+ INSTALL_STRIP_PROGRAM
+ STRIP
+ install_sh
+ MAKEINFO
+ AUTOHEADER
+ AUTOMAKE
+ AUTOCONF
+ ACLOCAL
+ VERSION
+ PACKAGE
+ CYGPATH_W
+ am__isrc
+ INSTALL_DATA
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ LIBWEBKITGTK_VERSION
+ WEBKIT_MICRO_VERSION
+ WEBKIT_MINOR_VERSION
+ WEBKIT_MAJOR_VERSION
+ target_os
+ target_vendor
+ target_cpu
+ target
+ host_os
+ host_vendor
+ host_cpu
+ host
+ build_os
+ build_vendor
+ build_cpu
+ build
+ ACLOCAL_AMFLAGS
+ target_alias
+ host_alias
+ build_alias
+ LIBS
+ ECHO_T
+ ECHO_N
+ ECHO_C
+ DEFS
+ mandir
+ localedir
+ libdir
+ psdir
+ pdfdir
+ dvidir
+ htmldir
+ infodir
+ docdir
+ oldincludedir
+ includedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+ datadir
+ datarootdir
+ libexecdir
+ sbindir
+ bindir
+ program_transform_name
+ prefix
+ exec_prefix
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+ PACKAGE_TARNAME
+ PACKAGE_NAME
+ PATH_SEPARATOR
+ SHELL'
ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+ enable_dependency_tracking
+ enable_largefile
+ enable_static
+ enable_shared
+ with_pic
+ enable_fast_install
+ with_gnu_ld
+ enable_libtool_lock
+ with_target
+ with_hildon
+ with_unicode_backend
+ enable_debug
+ enable_optimizations
+ enable_dashboard_support
+ enable_3D_transforms
+ enable_channel_messaging
+ enable_offline_web_applications
+ enable_dom_storage
+ enable_database
+ enable_icon_database
+ enable_video
+ enable_xpath
+ enable_xslt
+ enable_geolocation
+ enable_gnomekeyring
+ enable_svg
+ enable_wml
+ enable_web_workers
+ enable_svg_animation
+ enable_svg_filters
+ enable_svg_fonts
+ enable_svg_foreign_object
+ enable_svg_as_image
+ enable_svg_use_element
+ enable_coverage
+ enable_fast_malloc
+ enable_jit
+ with_font_backend
+ with_html_dir
+ enable_gtk_doc
+ '
ac_precious_vars='build_alias
host_alias
target_alias
@@@ -1058,6 -1131,8 +1131,8 @@@ GSTREAMER_LIBS
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ ac_unrecognized_opts=
+ ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@@ -1156,13 -1231,21 +1231,21 @@@ d
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+ "enable_$ac_useropt"
+ "*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@@ -1175,13 -1258,21 +1258,21 @@@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+ "enable_$ac_useropt"
+ "*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@@ -1372,22 -1463,38 +1463,38 @@@
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+ "with_$ac_useropt"
+ "*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+ "with_$ac_useropt"
+ "*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@@ -1407,7 -1514,7 +1514,7 @@@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@@ -1416,16 -1523,16 +1523,16 @@@
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@@ -1434,22 -1541,38 +1541,38 @@@ don
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
- # Be sure to have absolute directory names.
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+
+ # Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@@ -1464,7 -1587,7 +1587,7 @@@ target=$target_alia
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@@ -1480,10 -1603,10 +1603,10 @@@ test "$silent" = yes && exec 6>/dev/nul
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@@ -1491,12 -1614,12 +1614,12 @@@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -1523,12 -1646,12 +1646,12 @@@ els
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@@ -1555,7 -1678,7 +1678,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.4 to adapt to many kinds of systems.
+ \`configure' configures WebKit 1.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1577,9 -1700,9 +1700,9 @@@ Configuration
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@@ -1589,25 -1712,25 +1712,25 @@@ for instance \`--prefix=\$HOME'
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/webkit]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/webkit]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@@ -1626,11 -1749,12 +1749,12 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of WebKit 1.1.4:";;
+ short | recursive ) echo "Configuration of WebKit 1.1.5:";;
esac
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
@@@ -1682,6 -1806,7 +1806,7 @@@
--enable-fast-malloc enable optimized memory allocator default=yes,
default=no for debug builds
--enable-jit Enable JIT compilation default=yes
+ --enable-gtk-doc use gtk-doc to build documentation [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@@ -1696,6 -1821,7 +1821,7 @@@
Select Unicode backend default=icu
--with-font-backend=[freetype/pango]
Select font backend default=freetype
+ --with-html-dir=PATH path to installed docs
Some influential environment variables:
CC C compiler command
@@@ -1768,15 -1894,17 +1894,17 @@@ f
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -1812,7 -1940,7 +1940,7 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@@ -1821,11 -1949,11 +1949,11 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- WebKit configure 1.1.4
- generated by GNU Autoconf 2.61
+ WebKit configure 1.1.5
+ generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@@ -1835,8 -1963,8 +1963,8 @@@ 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.4, which was
- generated by GNU Autoconf 2.61. Invocation command line was
+ It was created by WebKit $as_me 1.1.5, which was
+ generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@@ -1872,7 -2000,7 +2000,7 @@@ for as_dir in $PAT
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@@ -1907,7 -2035,7 +2035,7 @@@ d
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@@ -1959,11 -2087,12 +2087,12 @@@ _ASBO
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@@ -1993,9 -2122,9 +2122,9 @@@ _ASBO
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@@ -2010,9 -2139,9 +2139,9 @@@ _ASBO
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@@ -2028,8 -2157,8 +2157,8 @@@ _ASBO
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@@ -2071,21 -2200,24 +2200,24 @@@ _ACEO
# Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
+ # Prefer an explicitly selected file to automatically selected ones.
+ ac_site_file1=NONE
+ ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
- shift
- for ac_site_file
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@@ -2095,16 -2227,16 +2227,16 @@@ if test -r "$cache_file"; the
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ $as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@@ -2118,29 -2250,38 +2250,38 @@@ for ac_var in $ac_precious_vars; d
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
- echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
- echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+ $as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@@ -2150,10 -2291,12 +2291,12 @@@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { $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: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -2207,8 -2350,8 +2350,8 @@@ for ac_dir in autotools "$srcdir"/autot
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
- echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
+ $as_echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -2228,34 -2371,34 +2371,34 @@@ ac_config_headers="$ac_config_headers a
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
- echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+ $as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
- { echo "$as_me:$LINENO: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ $as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+ $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
- echo "$as_me: error: invalid value of canonical build" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+ $as_echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@@ -2272,27 -2415,27 +2415,27 @@@ IFS=$ac_save_IF
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- { echo "$as_me:$LINENO: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+ $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+ $as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
- echo "$as_me: error: invalid value of canonical host" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+ $as_echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@@ -2309,27 -2452,27 +2452,27 @@@ IFS=$ac_save_IF
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- { echo "$as_me:$LINENO: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking target system type" >&5
+ $as_echo_n "checking target system type... " >&6; }
if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+ $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+ $as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
- echo "$as_me: error: invalid value of canonical target" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+ $as_echo "$as_me: error: invalid value of canonical target" >&2;}
{ (exit 1); exit 1; }; };;
esac
target=$ac_cv_target
@@@ -2355,14 -2498,14 +2498,14 @@@ test -n "$target_alias" &
WEBKIT_MAJOR_VERSION=1
WEBKIT_MINOR_VERSION=1
- WEBKIT_MICRO_VERSION=4
+ WEBKIT_MICRO_VERSION=5
- LIBWEBKITGTK_VERSION=4:0:2
+ LIBWEBKITGTK_VERSION=5:0:3
am__api_version='1.10'
@@@ -2380,11 -2523,12 +2523,12 @@@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
- { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ # Reject install programs that cannot install multiple files.
+ { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@@ -2413,17 -2557,29 +2557,29 @@@ case $as_dir/ i
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+ rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@@ -2436,8 -2592,8 +2592,8 @@@
INSTALL=$ac_install_sh
fi
fi
- { echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+ $as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@@ -2447,8 -2603,8 +2603,8 @@@ test -z "$INSTALL_SCRIPT" && INSTALL_SC
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { echo "$as_me:$LINENO: checking whether build environment is sane" >&5
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@@ -2471,9 -2627,9 +2627,9 @@@ if
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
- echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+ $as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -2484,26 -2640,23 +2640,23 @@@ the
# Ok.
:
else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
Check your system clock" >&5
- echo "$as_me: error: newly created file is older than distributed files!
+ $as_echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
+ # Double any \ or $.
# By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm -f conftest.sed
+ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@@ -2514,15 -2667,15 +2667,15 @@@ if eval "$MISSING --run true"; the
am_missing_run="$MISSING --run "
else
am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
- { echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
- echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@@ -2557,8 -2710,8 +2710,8 @@@ f
MKDIR_P="$ac_install_sh -d"
fi
fi
- { echo "$as_me:$LINENO: result: $MKDIR_P" >&5
- echo "${ECHO_T}$MKDIR_P" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
@@@ -2570,10 -2723,10 +2723,10 @@@ for ac_prog in gawk mawk nawk aw
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@@ -2586,7 -2739,7 +2739,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -2597,22 -2750,23 +2750,23 @@@ f
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
- { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@@ -2629,12 -2783,12 +2783,12 @@@ esa
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@@ -2653,8 -2807,8 +2807,8 @@@ if test "`cd $srcdir && pwd`" != "`pwd`
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+ $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@@ -2671,7 -2825,7 +2825,7 @@@ f
# Define the identity of the package.
PACKAGE='webkit'
- VERSION='1.1.4'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@@ -2709,10 -2863,10 +2863,10 @@@ if test "$cross_compiling" != no; the
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@@ -2725,7 -2879,7 +2879,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -2736,11 -2890,11 +2890,11 @@@ f
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
- echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -2749,10 -2903,10 +2903,10 @@@ if test -z "$ac_cv_prog_STRIP"; the
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@@ -2765,7 -2919,7 +2919,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -2776,11 -2930,11 +2930,11 @@@ f
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
- echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@@ -2788,12 -2942,8 +2942,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@@ -2812,8 -2962,8 +2962,8 @@@ INSTALL_STRIP_PROGRAM="\$(install_sh) -
AMTAR=${AMTAR-"${am_missing_run}tar"}
- { echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
- echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+ $as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
@@@ -2886,13 -3036,13 +3036,13 @@@ don
rm -rf conftest.dir
if test "${am_cv_prog_tar_ustar+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
fi
- { echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
- echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+ $as_echo "$am_cv_prog_tar_ustar" >&6; }
@@@ -2901,8 -3051,8 +3051,8 @@@
# host checking - inspired by the GTK+ configure.in
# TODO: move these to webkit.m4?
- { echo "$as_me:$LINENO: checking for native Win32" >&5
- echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for native Win32" >&5
+ $as_echo_n "checking for native Win32... " >&6; }
case "$host" in
*-*-mingw*)
os_win32=yes
@@@ -2911,8 -3061,8 +3061,8 @@@
os_win32=no
;;
esac
- { echo "$as_me:$LINENO: result: $os_win32" >&5
- echo "${ECHO_T}$os_win32" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $os_win32" >&5
+ $as_echo "$os_win32" >&6; }
case "$host" in
*-*-linux*)
@@@ -2948,8 -3098,8 +3098,8 @@@ am__doit
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
- { echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
- echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+ $as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
@@@ -2976,8 -3126,8 +3126,8 @@@ if test "$am__include" = "#"; the
fi
- { echo "$as_me:$LINENO: result: $_am_result" >&5
- echo "${ECHO_T}$_am_result" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+ $as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
@@@ -3006,10 -3156,10 +3156,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3022,7 -3172,7 +3172,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3033,11 -3183,11 +3183,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -3046,10 -3196,10 +3196,10 @@@ if test -z "$ac_cv_prog_CC"; the
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -3062,7 -3212,7 +3212,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3073,11 -3223,11 +3223,11 @@@ f
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@@ -3085,12 -3235,8 +3235,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@@ -3103,10 -3249,10 +3249,10 @@@ if test -z "$CC"; the
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3119,7 -3265,7 +3265,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3130,11 -3276,11 +3276,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -3143,10 -3289,10 +3289,10 @@@ f
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3164,7 -3310,7 +3310,7 @@@ d
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3187,11 -3333,11 +3333,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -3202,10 -3348,10 +3348,10 @@@ if test -z "$CC"; the
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3218,7 -3364,7 +3364,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3229,11 -3375,11 +3375,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -3246,10 -3392,10 +3392,10 @@@ if test -z "$CC"; the
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -3262,7 -3408,7 +3408,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -3273,11 -3419,11 +3419,11 @@@ f
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -3289,12 -3435,8 +3435,8 @@@ don
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@@ -3304,44 -3446,50 +3446,50 @@@ f
fi
- test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ test -z "$CC" && { { $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: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
- echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@@ -3360,27 -3508,22 +3508,22 @@@ main (
}
_ACEOF
ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
- { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
- echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- #
- # List of possible output files, starting from the most likely.
- # The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
- # only as a last resort. b.out is created by i960 compilers.
- ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
- #
- # The IRIX 6 linker writes into existing files which may not be
- # executable, retaining their permissions. Remove them first so a
- # subsequent execution test works.
+ { $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+ $as_echo_n "checking for C compiler default output file name... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+ ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@@ -3391,10 -3534,11 +3534,11 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@@ -3405,7 -3549,7 +3549,7 @@@ for ac_file in $ac_files '
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@@ -3432,25 -3576,27 +3576,27 @@@ els
ac_file=''
fi
- { echo "$as_me:$LINENO: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { { echo "$as_me:$LINENO: error: C compiler cannot create executables
+ { { $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: C compiler cannot create executables
See \`config.log' for more details." >&5
- echo "$as_me: error: C compiler cannot create executables
+ $as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ { (exit 77); exit 77; }; }; }
fi
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
- { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ $as_echo_n "checking whether the C compiler works... " >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@@ -3459,49 -3605,53 +3605,53 @@@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $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: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
+ $as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
fi
fi
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
- { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ $as_echo_n "checking whether we are cross compiling... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
- { echo "$as_me:$LINENO: checking for suffix of executables" >&5
- echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@@ -3510,31 -3660,33 +3660,33 @@@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { $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: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest$ac_cv_exeext
- { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
- { echo "$as_me:$LINENO: checking for suffix of object files" >&5
- echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -3557,40 -3709,43 +3709,43 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ { { $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: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
- { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -3616,20 -3771,21 +3771,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@@ -3639,15 -3795,19 +3795,19 @@@ rm -f core conftest.err conftest.$ac_ob
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+ else
+ GCC=
+ fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
- { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@@ -3674,20 -3834,21 +3834,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@@ -3712,20 -3873,21 +3873,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@@ -3751,20 -3913,21 +3913,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -3779,8 -3942,8 +3942,8 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@@ -3796,10 -3959,10 +3959,10 @@@ els
CFLAGS=
fi
fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@@ -3870,20 -4033,21 +4033,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -3899,15 -4063,15 +4063,15 @@@ f
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
- echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@@ -3919,10 -4083,10 +4083,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
depcc="$CC" am_compiler_list=
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
- echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@@ -4010,8 -4174,8 +4174,8 @@@ els
fi
fi
- { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
@@@ -4027,16 -4191,16 +4191,16 @@@ f
if test "x$CC" != xcc; then
- { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
- echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+ $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
else
- { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
- echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
fi
- set dummy $CC; ac_cc=`echo $2 |
+ set dummy $CC; ac_cc=`$as_echo "$2" |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -4062,19 -4226,21 +4226,21 @@@ if { (case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
test -f conftest2.$ac_objext && { (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
@@@ -4085,10 -4251,11 +4251,11 @@@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@@ -4096,19 -4263,21 +4263,21 @@@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
test -f conftest2.$ac_objext && { (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); };
then
# cc works too.
@@@ -4126,11 -4295,11 +4295,11 @@@ rm -f core conftest
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
cat >>confdefs.h <<\_ACEOF
#define NO_MINUS_C_MINUS_O 1
@@@ -4144,15 -4313,15 +4313,15 @@@ ac_cpp='$CPP $CPPFLAGS
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+ $as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@@ -4184,20 -4353,21 +4353,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@@ -4221,13 -4391,14 +4391,14 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@@ -4235,7 -4406,7 +4406,7 @@@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@@ -4260,8 -4431,8 +4431,8 @@@ f
else
ac_cv_prog_CPP=$CPP
fi
- { echo "$as_me:$LINENO: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CPP" >&5
+ $as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@@ -4289,20 -4460,21 +4460,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@@ -4326,13 -4498,14 +4498,14 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@@ -4340,7 -4513,7 +4513,7 @@@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@@ -4356,11 -4529,13 +4529,13 @@@ rm -f conftest.err conftest.$ac_ex
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $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: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@@ -4370,42 -4545,37 +4545,37 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
- echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Extract the first word of "grep ggrep" to use in msg output
- if test -z "$GREP"; then
- set dummy grep ggrep; ac_prog_name=$2
- if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@@ -4420,74 -4590,60 +4590,60 @@@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
done
-
- done
IFS=$as_save_IFS
-
-
- fi
-
- GREP="$ac_cv_path_GREP"
- if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_GREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ $as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
- echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+ $as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
- { echo "$as_me:$LINENO: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
- if test -z "$EGREP"; then
- set dummy egrep; ac_prog_name=$2
- if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@@ -4502,33 -4658,24 +4658,24 @@@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
done
-
- done
IFS=$as_save_IFS
-
-
- fi
-
- EGREP="$ac_cv_path_EGREP"
- if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_EGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ $as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
- echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+ $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
@@@ -4545,11 -4692,11 +4692,11 @@@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ $as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -4567,20 -4714,21 +4714,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@@ -4588,12 -4736,15 +4736,15 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@@ -4604,8 -4755,8 +4755,8 @@@ don
# check for -fvisibility=hidden compiler support (GCC >= 4)
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
- { echo "$as_me:$LINENO: checking if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden" >&5
- echo $ECHO_N "checking if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden" >&5
+ $as_echo_n "checking if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
char foo;
_ACEOF
@@@ -4615,26 -4766,27 +4766,27 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@@ -4644,10 -4796,10 +4796,10 @@@ CFLAGS="$saved_CFLAGS
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@@ -4662,7 -4814,7 +4814,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4675,26 -4827,26 +4827,26 @@@ esa
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "$PKG_CONFIG" = "no"; then
- { { echo "$as_me:$LINENO: error: Cannot find pkg-config, make sure it is installed in your PATH" >&5
- echo "$as_me: error: Cannot find pkg-config, make sure it is installed in your PATH" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Cannot find pkg-config, make sure it is installed in your PATH" >&5
+ $as_echo "$as_me: error: Cannot find pkg-config, make sure it is installed in your PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
@@@ -4709,7 -4861,7 +4861,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4721,26 -4873,26 +4873,26 @@@ esa
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: result: $PERL" >&5
- echo "${ECHO_T}$PERL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+ $as_echo "$PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$PERL"; then
- { { echo "$as_me:$LINENO: error: You need 'perl' to compile WebKit" >&5
- echo "$as_me: error: You need 'perl' to compile WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need 'perl' to compile WebKit" >&5
+ $as_echo "$as_me: error: You need 'perl' to compile WebKit" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "bison", so it can be a program name with args.
set dummy bison; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_BISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $BISON in
[\\/]* | ?:[\\/]*)
@@@ -4755,7 -4907,7 +4907,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4767,26 -4919,26 +4919,26 @@@ esa
fi
BISON=$ac_cv_path_BISON
if test -n "$BISON"; then
- { echo "$as_me:$LINENO: result: $BISON" >&5
- echo "${ECHO_T}$BISON" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $BISON" >&5
+ $as_echo "$BISON" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$BISON"; then
- { { echo "$as_me:$LINENO: error: You need the 'bison' parser generator to compile WebKit" >&5
- echo "$as_me: error: You need the 'bison' parser generator to compile WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need the 'bison' parser generator to compile WebKit" >&5
+ $as_echo "$as_me: error: You need the 'bison' parser generator to compile WebKit" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_MV+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $MV in
[\\/]* | ?:[\\/]*)
@@@ -4801,7 -4953,7 +4953,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4813,17 -4965,17 +4965,17 @@@ esa
fi
MV=$ac_cv_path_MV
if test -n "$MV"; then
- { echo "$as_me:$LINENO: result: $MV" >&5
- echo "${ECHO_T}$MV" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MV" >&5
+ $as_echo "$MV" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$MV"; then
- { { echo "$as_me:$LINENO: error: You need 'mv' to compile WebKit" >&5
- echo "$as_me: error: You need 'mv' to compile WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need 'mv' to compile WebKit" >&5
+ $as_echo "$as_me: error: You need 'mv' to compile WebKit" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -4845,10 -4997,10 +4997,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -4861,7 -5013,7 +5013,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4872,11 -5024,11 +5024,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -4885,10 -5037,10 +5037,10 @@@ if test -z "$ac_cv_prog_CC"; the
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -4901,7 -5053,7 +5053,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4912,11 -5064,11 +5064,11 @@@ f
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@@ -4924,12 -5076,8 +5076,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@@ -4942,10 -5090,10 +5090,10 @@@ if test -z "$CC"; the
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -4958,7 -5106,7 +5106,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -4969,11 -5117,11 +5117,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -4982,10 -5130,10 +5130,10 @@@ f
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -5003,7 -5151,7 +5151,7 @@@ d
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -5026,11 -5174,11 +5174,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -5041,10 -5189,10 +5189,10 @@@ if test -z "$CC"; the
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -5057,7 -5205,7 +5205,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -5068,11 -5216,11 +5216,11 @@@ f
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -5085,10 -5233,10 +5233,10 @@@ if test -z "$CC"; the
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -5101,7 -5249,7 +5249,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -5112,11 -5260,11 +5260,11 @@@ f
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -5128,12 -5276,8 +5276,8 @@@ don
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@@ -5143,50 -5287,56 +5287,56 @@@ f
fi
- test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ test -z "$CC" && { { $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: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
- echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -5212,20 -5362,21 +5362,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@@ -5235,15 -5386,19 +5386,19 @@@ rm -f core conftest.err conftest.$ac_ob
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+ else
+ GCC=
+ fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
- { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@@ -5270,20 -5425,21 +5425,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@@ -5308,20 -5464,21 +5464,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@@ -5347,20 -5504,21 +5504,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -5375,8 -5533,8 +5533,8 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@@ -5392,10 -5550,10 +5550,10 @@@ els
CFLAGS=
fi
fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@@ -5466,20 -5624,21 +5624,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -5495,15 -5654,15 +5654,15 @@@ f
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
- echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@@ -5515,10 -5674,10 +5674,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
depcc="$CC" am_compiler_list=
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
- echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@@ -5606,8 -5765,8 +5765,8 @@@ els
fi
fi
- { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
@@@ -5627,8 -5786,9 +5786,9 @@@ 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
- 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
+ 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
# 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.
@@@ -5652,10 -5812,10 +5812,10 @@@ if test -z "$CXX"; the
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@@ -5668,7 -5828,7 +5828,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -5679,11 -5839,11 +5839,11 @@@ f
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { echo "$as_me:$LINENO: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+ $as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -5696,10 -5856,10 +5856,10 @@@ if test -z "$CXX"; the
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@@ -5712,7 -5872,7 +5872,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -5723,11 -5883,11 +5883,11 @@@ f
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+ $as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -5739,12 -5899,8 +5899,8 @@@ don
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@@ -5754,43 -5910,47 +5910,47 @@@ f
fi
fi
# Provide some information about the compiler.
- echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+ $as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- { echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -5816,20 -5976,21 +5976,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@@ -5839,15 -6000,19 +6000,19 @@@ rm -f core conftest.err conftest.$ac_ob
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
- { echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+ $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GXX=yes
+ else
+ GXX=
+ fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
- { echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
- echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
@@@ -5874,20 -6039,21 +6039,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
@@@ -5912,20 -6078,21 +6078,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@@ -5951,20 -6118,21 +6118,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -5979,8 -6147,8 +6147,8 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+ $as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@@ -6004,10 -6172,10 +6172,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
depcc="$CXX" am_compiler_list=
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
- echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@@ -6095,8 -6263,8 +6263,8 @@@ els
fi
fi
- { echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
- echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
@@@ -6123,11 -6291,12 +6291,12 @@@ f
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
- { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ # Reject install programs that cannot install multiple files.
+ { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@@ -6156,17 -6325,29 +6325,29 @@@ case $as_dir/ i
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+ rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@@ -6179,8 -6360,8 +6360,8 @@@
INSTALL=$ac_install_sh
fi
fi
- { echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+ $as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@@ -6197,10 -6378,10 +6378,10 @@@ f
if test "$enable_largefile" != no; then
- { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
if test "${ac_cv_sys_largefile_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
if test "$GCC" != yes; then
@@@ -6237,20 -6418,21 +6418,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6264,20 -6446,21 +6446,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_sys_largefile_CC=' -n32'; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6290,16 -6473,16 +6473,16 @@@ rm -f core conftest.err conftest.$ac_ob
rm -f conftest.$ac_ext
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
while :; do
cat >conftest.$ac_ext <<_ACEOF
@@@ -6331,20 -6514,21 +6514,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_sys_file_offset_bits=no; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6381,20 -6565,21 +6565,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_sys_file_offset_bits=64; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6405,8 -6590,8 +6590,8 @@@ rm -f core conftest.err conftest.$ac_ob
break
done
fi
- { echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+ $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
*)
@@@ -6415,12 -6600,12 +6600,12 @@@ cat >>confdefs.h <<_ACEO
_ACEOF
;;
esac
- rm -f conftest*
+ rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
- { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
if test "${ac_cv_sys_large_files+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
while :; do
cat >conftest.$ac_ext <<_ACEOF
@@@ -6452,20 -6637,21 +6637,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_sys_large_files=no; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6502,20 -6688,21 +6688,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_sys_large_files=1; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6526,8 -6713,8 +6713,8 @@@ rm -f core conftest.err conftest.$ac_ob
break
done
fi
- { echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+ $as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
*)
@@@ -6536,7 -6723,7 +6723,7 @@@ cat >>confdefs.h <<_ACEO
_ACEOF
;;
esac
- rm -f conftest*
+ rm -rf conftest*
fi
fi
@@@ -6570,24 -6757,25 +6757,25 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { { echo "$as_me:$LINENO: error: No C++ compiler found" >&5
- echo "$as_me: error: No C++ compiler found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: No C++ compiler found" >&5
+ $as_echo "$as_me: error: No C++ compiler found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -6600,10 -6788,10 +6788,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
# C/C++ Language Features
- { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -6675,20 -6863,21 +6863,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_const=no
@@@ -6696,20 -6885,20 +6885,20 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ $as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
- #define const
+ #define const /**/
_ACEOF
fi
- { echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
@@@ -6732,20 -6921,21 +6921,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_c_inline=$ac_kw
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -6756,8 -6946,8 +6946,8 @@@ rm -f core conftest.err conftest.$ac_ob
done
fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ $as_echo "$ac_cv_c_inline" >&6; }
case $ac_cv_c_inline in
@@@ -6775,10 -6965,10 +6965,10 @@@ _ACEO
;;
esac
- { echo "$as_me:$LINENO: checking for working volatile" >&5
- echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for working volatile" >&5
+ $as_echo_n "checking for working volatile... " >&6; }
if test "${ac_cv_c_volatile+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -6804,20 -6994,21 +6994,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_c_volatile=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_volatile=no
@@@ -6825,22 -7016,22 +7016,22 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
- echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+ $as_echo "$ac_cv_c_volatile" >&6; }
if test $ac_cv_c_volatile = no; then
cat >>confdefs.h <<\_ACEOF
- #define volatile
+ #define volatile /**/
_ACEOF
fi
# C/C++ Headers
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -6867,20 -7058,21 +7058,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@@ -6972,37 -7164,40 +7164,40 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
+ rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+ $as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@@ -7011,10 -7206,10 +7206,10 @@@ _ACEO
fi
- { echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
- echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+ $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
if test "${ac_cv_header_stdbool_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -7055,6 -7250,8 +7250,8 @@@ cat >>conftest.$ac_ext <<_ACEO
char h[sizeof (_Bool)];
char i[sizeof s.t];
enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
_Bool n[m];
char o[sizeof n == m * sizeof n[0] ? 1 : -1];
char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
@@@ -7104,20 -7301,21 +7301,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdbool_h=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdbool_h=no
@@@ -7125,28 -7323,60 +7323,60 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
- echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
- { echo "$as_me:$LINENO: checking for _Bool" >&5
- echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+ $as_echo "$ac_cv_header_stdbool_h" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+ $as_echo_n "checking for _Bool... " >&6; }
if test "${ac_cv_type__Bool+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_type__Bool=no
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
- if ((ac__type_new_ *) 0)
- return 0;
- if (sizeof (ac__type_new_))
+ if (sizeof (_Bool))
+ return 0;
+ ;
return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ int
+ main ()
+ {
+ if (sizeof ((_Bool)))
+ return 0;
;
return 0;
}
@@@ -7157,30 -7387,39 +7387,39 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_type__Bool=yes
+ :
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type__Bool=yes
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type__Bool=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
- echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
- if test $ac_cv_type__Bool = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+ $as_echo "$ac_cv_type__Bool" >&6; }
+ if test "x$ac_cv_type__Bool" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
@@@ -7234,14 -7473,14 +7473,14 @@@ f
enable_win32_dll=yes
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
ac_cv_prog_AS="$AS" # Let the user override the test.
@@@ -7254,7 -7493,7 +7493,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7265,11 -7504,11 +7504,11 @@@ f
fi
AS=$ac_cv_prog_AS
if test -n "$AS"; then
- { echo "$as_me:$LINENO: result: $AS" >&5
- echo "${ECHO_T}$AS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AS" >&5
+ $as_echo "$AS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -7278,10 -7517,10 +7517,10 @@@ if test -z "$ac_cv_prog_AS"; the
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
@@@ -7294,7 -7533,7 +7533,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7305,11 -7544,11 +7544,11 @@@ f
fi
ac_ct_AS=$ac_cv_prog_ac_ct_AS
if test -n "$ac_ct_AS"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
- echo "${ECHO_T}$ac_ct_AS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+ $as_echo "$ac_ct_AS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_AS" = x; then
@@@ -7317,12 -7556,8 +7556,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
AS=$ac_ct_AS
@@@ -7334,10 -7569,10 +7569,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@@ -7350,7 -7585,7 +7585,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7361,11 -7596,11 +7596,11 @@@ f
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
- echo "${ECHO_T}$DLLTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+ $as_echo "$DLLTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -7374,10 -7609,10 +7609,10 @@@ if test -z "$ac_cv_prog_DLLTOOL"; the
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@@ -7390,7 -7625,7 +7625,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7401,11 -7636,11 +7636,11 @@@ f
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
- echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+ $as_echo "$ac_ct_DLLTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_DLLTOOL" = x; then
@@@ -7413,12 -7648,8 +7648,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DLLTOOL=$ac_ct_DLLTOOL
@@@ -7430,10 -7661,10 +7661,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
@@@ -7446,7 -7677,7 +7677,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7457,11 -7688,11 +7688,11 @@@ f
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
- echo "${ECHO_T}$OBJDUMP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ $as_echo "$OBJDUMP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -7470,10 -7701,10 +7701,10 @@@ if test -z "$ac_cv_prog_OBJDUMP"; the
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
@@@ -7486,7 -7717,7 +7717,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7497,11 -7728,11 +7728,11 @@@ f
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
- echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_OBJDUMP" = x; then
@@@ -7509,12 -7740,8 +7740,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
OBJDUMP=$ac_ct_OBJDUMP
@@@ -7548,14 -7775,14 +7775,14 @@@ test -z "$OBJDUMP" && OBJDUMP=objdum
case `pwd` in
*\ * | *\ *)
- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
- echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
- macro_version='2.2.4'
- macro_revision='1.2976'
+ macro_version='2.2.6'
+ macro_revision='1.3012'
@@@ -7571,48 -7798,43 +7798,43 @@@
ltmain="$ac_aux_dir/ltmain.sh"
- { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
- echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
- echo "$ac_script" | sed 99q >conftest.sed
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
$as_unset ac_script || ac_script=
- # Extract the first word of "sed gsed" to use in msg output
- if test -z "$SED"; then
- set dummy sed gsed; ac_prog_name=$2
- if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+ if test -z "$SED"; then
ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
- # Check for GNU ac_path_SED and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo '' >> "conftest.nl"
+ $as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@@ -7627,31 -7849,23 +7849,23 @@@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_SED_found && break 3
+ $ac_path_SED_found && break 3
+ done
done
done
-
- done
IFS=$as_save_IFS
-
-
- fi
-
- SED="$ac_cv_path_SED"
- if test -z "$SED"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+ if test -z "$ac_cv_path_SED"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+ $as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+ fi
else
ac_cv_path_SED=$SED
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
- echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+ $as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
@@@ -7668,45 -7882,40 +7882,40 @@@ Xsed="$SED -e 1s/^X//
- { echo "$as_me:$LINENO: checking for fgrep" >&5
- echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
if test "${ac_cv_path_FGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
then ac_cv_path_FGREP="$GREP -F"
else
- # Extract the first word of "fgrep" to use in msg output
- if test -z "$FGREP"; then
- set dummy fgrep; ac_prog_name=$2
- if test "${ac_cv_path_FGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+ if test -z "$FGREP"; then
ac_path_FGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in fgrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
- # Check for GNU ac_path_FGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
*GNU*)
ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'FGREP' >> "conftest.nl"
+ $as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@@ -7721,33 -7930,24 +7930,24 @@@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_FGREP_found && break 3
+ $ac_path_FGREP_found && break 3
+ done
done
done
-
- done
IFS=$as_save_IFS
-
-
- fi
-
- FGREP="$ac_cv_path_FGREP"
- if test -z "$FGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_FGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ $as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+ fi
else
ac_cv_path_FGREP=$FGREP
fi
-
fi
fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
- echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+ $as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
@@@ -7781,8 -7981,8 +7981,8 @@@ f
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
- echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@@ -7811,14 -8011,14 +8011,14 @@@
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
- echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
- echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@@ -7848,19 -8048,19 +8048,19 @@@ f
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ $as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ $as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
- { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
- echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@@ -7872,8 -8072,8 +8072,8 @@@
;;
esac
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
- echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@@ -7884,10 -8084,10 +8084,10 @@@
- { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
- echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
# Let the user override the test.
@@@ -7933,8 -8133,8 +8133,8 @@@ els
: ${lt_cv_path_NM=no}
fi
fi
- { echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
- echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+ $as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
@@@ -7944,10 -8144,10 +8144,10 @@@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
@@@ -7960,7 -8160,7 +8160,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -7971,11 -8171,11 +8171,11 @@@ f
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
- echo "${ECHO_T}$DUMPBIN" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+ $as_echo "$DUMPBIN" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -7988,10 -8188,10 +8188,10 @@@ if test -z "$DUMPBIN"; the
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
@@@ -8004,7 -8204,7 +8204,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8015,11 -8215,11 +8215,11 @@@ f
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
- echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+ $as_echo "$ac_ct_DUMPBIN" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -8031,12 -8231,8 +8231,8 @@@ don
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DUMPBIN=$ac_ct_DUMPBIN
@@@ -8055,45 -8251,45 +8251,45 @@@ test -z "$NM" && NM=n
- { echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
- echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
if test "${lt_cv_nm_interface+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8065: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8261: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8068: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8264: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8071: output\"" >&5)
+ (eval echo "\"\$as_me:8267: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
rm -f conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
- echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+ $as_echo "$lt_cv_nm_interface" >&6; }
- { echo "$as_me:$LINENO: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ $as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+ $as_echo "no, using $LN_S" >&6; }
fi
# find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
i=0
teststring="ABCD"
@@@ -8114,7 -8310,7 +8310,7 @@@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw*)
+ cygwin* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@@ -8210,11 -8406,11 +8406,11 @@@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
- echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
- { echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6; }
+ { $as_echo "$as_me:$LINENO: result: none" >&5
+ $as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
@@@ -8227,8 -8423,8 +8423,8 @@@
: ${MV="mv -f"}
: ${RM="rm -f"}
- { echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
- echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@@ -8237,18 -8433,18 +8433,18 @@@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
- { echo "$as_me:$LINENO: result: $xsi_shell" >&5
- echo "${ECHO_T}$xsi_shell" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+ $as_echo "$xsi_shell" >&6; }
- { echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
- echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+ $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
lt_shell_append=no
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
>/dev/null 2>&1 \
&& lt_shell_append=yes
- { echo "$as_me:$LINENO: result: $lt_shell_append" >&5
- echo "${ECHO_T}$lt_shell_append" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+ $as_echo "$lt_shell_append" >&6; }
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@@ -8282,15 -8478,15 +8478,15 @@@ esa
- { echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
- echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
fi
- { echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
- echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+ $as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
@@@ -8315,11 -8511,109 +8511,109 @@@ esa
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ OBJDUMP=$ac_cv_prog_OBJDUMP
+ if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ $as_echo "$OBJDUMP" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ fi
+ if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+ if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+ else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+ fi
+
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
- { echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
- echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@@ -8369,6 -8663,12 +8663,12 @@@ mingw* | pw32*
fi
;;
+ cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
+
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@@ -8506,8 -8806,8 +8806,8 @@@ tpf*
esac
fi
- { echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
- echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@@ -8526,10 -8826,10 +8826,10 @@@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@@ -8542,7 -8842,7 +8842,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8553,11 -8853,11 +8853,11 @@@ f
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { echo "$as_me:$LINENO: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AR" >&5
+ $as_echo "$AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -8566,10 -8866,10 +8866,10 @@@ if test -z "$ac_cv_prog_AR"; the
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@@ -8582,7 -8882,7 +8882,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8593,11 -8893,11 +8893,11 @@@ f
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ $as_echo "$ac_ct_AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_AR" = x; then
@@@ -8605,12 -8905,8 +8905,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
@@@ -8635,10 -8931,10 +8931,10 @@@ test -z "$AR_FLAGS" && AR_FLAGS=cr
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@@ -8651,7 -8947,7 +8947,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8662,11 -8958,11 +8958,11 @@@ f
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
- echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -8675,10 -8971,10 +8971,10 @@@ if test -z "$ac_cv_prog_STRIP"; the
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@@ -8691,7 -8987,7 +8987,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8702,11 -8998,11 +8998,11 @@@ f
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
- echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@@ -8714,12 -9010,8 +9010,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@@ -8738,10 -9030,10 +9030,10 @@@ test -z "$STRIP" && STRIP=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@@ -8754,7 -9046,7 +9046,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8765,11 -9057,11 +9057,11 @@@ f
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ $as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -8778,10 -9070,10 +9070,10 @@@ if test -z "$ac_cv_prog_RANLIB"; the
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@@ -8794,7 -9086,7 +9086,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -8805,11 -9097,11 +9097,11 @@@ f
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ $as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@@ -8817,12 -9109,8 +9109,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@@ -8899,10 -9187,10 +9187,10 @@@ compiler=$C
# Check for command to grab the raw symbol name followed by C symbol from nm.
- { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
- echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# These are sane defaults that work on at least a few old systems.
@@@ -8919,7 -9207,7 +9207,7 @@@ case $host_os i
aix*)
symcode='[BCDT]'
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@@ -9020,14 -9308,14 +9308,14 @@@ _LT_EO
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Now try to grab the symbols.
nlist=conftest.nm
if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@@ -9084,7 -9372,7 +9372,7 @@@ _LT_EO
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@@ -9119,11 -9407,11 +9407,11 @@@ if test -z "$lt_cv_sys_global_symbol_pi
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { echo "$as_me:$LINENO: result: failed" >&5
- echo "${ECHO_T}failed" >&6; }
+ { $as_echo "$as_me:$LINENO: result: failed" >&5
+ $as_echo "failed" >&6; }
else
- { echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
fi
@@@ -9163,7 -9451,7 +9451,7 @@@ ia64-*-hpux*
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
@@@ -9178,11 -9466,11 +9466,11 @@@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9181 "configure"' > conftest.$ac_ext
+ echo '#line 9469 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@@ -9220,7 -9508,7 +9508,7 @@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
@@@ -9270,10 -9558,10 +9558,10 @@@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
- echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@@ -9302,26 -9590,30 +9590,30 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_cv_cc_needs_belf=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
@@@ -9331,8 -9623,8 +9623,8 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
- { echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
- echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+ $as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
@@@ -9344,7 -9636,7 +9636,7 @@@ sparc*-*solaris*
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
@@@ -9371,10 -9663,10 +9663,10 @@@ need_locks="$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@@ -9387,7 -9679,7 +9679,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9398,11 -9690,11 +9690,11 @@@ f
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
- echo "${ECHO_T}$DSYMUTIL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+ $as_echo "$DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -9411,10 -9703,10 +9703,10 @@@ if test -z "$ac_cv_prog_DSYMUTIL"; the
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@@ -9427,7 -9719,7 +9719,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9438,11 -9730,11 +9730,11 @@@ f
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
- echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+ $as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_DSYMUTIL" = x; then
@@@ -9450,12 -9742,8 +9742,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DSYMUTIL=$ac_ct_DSYMUTIL
@@@ -9467,10 -9755,10 +9755,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@@ -9483,7 -9771,7 +9771,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9494,11 -9782,11 +9782,11 @@@ f
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
- { echo "$as_me:$LINENO: result: $NMEDIT" >&5
- echo "${ECHO_T}$NMEDIT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+ $as_echo "$NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -9507,10 -9795,10 +9795,10 @@@ if test -z "$ac_cv_prog_NMEDIT"; the
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@@ -9523,7 -9811,7 +9811,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9534,11 -9822,11 +9822,11 @@@ f
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
- echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+ $as_echo "$ac_ct_NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_NMEDIT" = x; then
@@@ -9546,12 -9834,8 +9834,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
NMEDIT=$ac_ct_NMEDIT
@@@ -9563,10 -9847,10 +9847,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
@@@ -9579,7 -9863,7 +9863,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9590,11 -9874,11 +9874,11 @@@ f
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
- { echo "$as_me:$LINENO: result: $LIPO" >&5
- echo "${ECHO_T}$LIPO" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+ $as_echo "$LIPO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -9603,10 -9887,10 +9887,10 @@@ if test -z "$ac_cv_prog_LIPO"; the
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
@@@ -9619,7 -9903,7 +9903,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIPO="lipo"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9630,11 -9914,11 +9914,11 @@@ f
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
- echo "${ECHO_T}$ac_ct_LIPO" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+ $as_echo "$ac_ct_LIPO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_LIPO" = x; then
@@@ -9642,12 -9926,8 +9926,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LIPO=$ac_ct_LIPO
@@@ -9659,10 -9939,10 +9939,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
@@@ -9675,7 -9955,7 +9955,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9686,11 -9966,11 +9966,11 @@@ f
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
- { echo "$as_me:$LINENO: result: $OTOOL" >&5
- echo "${ECHO_T}$OTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+ $as_echo "$OTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -9699,10 -9979,10 +9979,10 @@@ if test -z "$ac_cv_prog_OTOOL"; the
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
@@@ -9715,7 -9995,7 +9995,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL="otool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9726,11 -10006,11 +10006,11 @@@ f
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
- echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+ $as_echo "$ac_ct_OTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_OTOOL" = x; then
@@@ -9738,12 -10018,8 +10018,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
OTOOL=$ac_ct_OTOOL
@@@ -9755,10 -10031,10 +10031,10 @@@ f
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
@@@ -9771,7 -10047,7 +10047,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9782,11 -10058,11 +10058,11 @@@ f
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
- { echo "$as_me:$LINENO: result: $OTOOL64" >&5
- echo "${ECHO_T}$OTOOL64" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+ $as_echo "$OTOOL64" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -9795,10 -10071,10 +10071,10 @@@ if test -z "$ac_cv_prog_OTOOL64"; the
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
@@@ -9811,7 -10087,7 +10087,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -9822,11 -10098,11 +10098,11 @@@ f
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
- echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+ $as_echo "$ac_ct_OTOOL64" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_ct_OTOOL64" = x; then
@@@ -9834,12 -10110,8 +10110,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
OTOOL64=$ac_ct_OTOOL64
@@@ -9874,10 -10146,10 +10146,10 @@@ f
- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
- echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
@@@ -9901,12 -10173,12 +10173,12 @@@
rm -f conftest.*
fi
fi
- { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
- echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
- echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
@@@ -9933,33 -10205,37 +10205,37 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_cv_ld_exported_symbols_list=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_ld_exported_symbols_list=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
fi
- { echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
- echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@@ -9998,11 -10274,11 +10274,11 @@@
for ac_header in dlfcn.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ $as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -10020,20 -10296,21 +10296,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@@ -10041,12 -10318,15 +10318,15 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@@ -10069,10 -10349,10 +10349,10 @@@ if test -z "$CXX"; the
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@@ -10085,7 -10365,7 +10365,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -10096,11 -10376,11 +10376,11 @@@ f
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { echo "$as_me:$LINENO: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+ $as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -10113,10 -10393,10 +10393,10 @@@ if test -z "$CXX"; the
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@@ -10129,7 -10409,7 +10409,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -10140,11 -10420,11 +10420,11 @@@ f
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+ $as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -10156,12 -10436,8 +10436,8 @@@ don
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@@ -10171,43 -10447,47 +10447,47 @@@ f
fi
fi
# Provide some information about the compiler.
- echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+ $as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- { echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -10233,20 -10513,21 +10513,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@@ -10256,15 -10537,19 +10537,19 @@@ rm -f core conftest.err conftest.$ac_ob
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
- { echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+ $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GXX=yes
+ else
+ GXX=
+ fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
- { echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
- echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
@@@ -10291,20 -10576,21 +10576,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
@@@ -10329,20 -10615,21 +10615,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@@ -10368,20 -10655,21 +10655,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@@ -10396,8 -10684,8 +10684,8 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+ $as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@@ -10421,10 -10709,10 +10709,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
depcc="$CXX" am_compiler_list=
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
- echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@@ -10512,8 -10800,8 +10800,8 @@@ els
fi
fi
- { echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
- echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
@@@ -10535,11 -10823,11 +10823,11 @@@ ac_cpp='$CXXCPP $CPPFLAGS
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- { echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+ $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
@@@ -10571,20 -10859,21 +10859,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@@ -10608,13 -10897,14 +10897,14 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
@@@ -10622,7 -10912,7 +10912,7 @@@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@@ -10647,8 -10937,8 +10937,8 @@@ f
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
- { echo "$as_me:$LINENO: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+ $as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@@ -10676,20 -10966,21 +10966,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@@ -10713,13 -11004,14 +11004,14 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
@@@ -10727,7 -11019,7 +11019,7 @@@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@@ -10743,7 -11035,9 +11035,9 @@@ rm -f conftest.err conftest.$ac_ex
if $ac_preproc_ok; then
:
else
- _lt_caught_CXX_error=yes
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ _lt_caught_CXX_error=yes; }
fi
ac_ext=c
@@@ -10898,10 -11192,10 +11192,10 @@@ if test -n "${ZSH_VERSION+set}" ; the
setopt NO_GLOB_SUBST
fi
- { echo "$as_me:$LINENO: checking for objdir" >&5
- echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
@@@ -10913,8 -11207,8 +11207,8 @@@ els
fi
rmdir .libs 2>/dev/null
fi
- { echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
- echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+ $as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@@ -11006,10 -11300,10 +11300,10 @@@ test -z "$MAGIC_CMD" && MAGIC_CMD=fil
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
- echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
@@@ -11059,11 -11353,11 +11353,11 @@@ f
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
- echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -11072,10 -11366,10 +11366,10 @@@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { echo "$as_me:$LINENO: checking for file" >&5
- echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
@@@ -11125,11 -11419,11 +11419,11 @@@ f
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
- echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -11209,10 -11503,10 +11503,10 @@@ lt_prog_compiler_no_builtin_flag
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@@ -11227,11 -11521,11 +11521,11 @@@
-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:11230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11234: \$? = $ac_status" >&5
+ echo "$as_me:11528: \$? = $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.
@@@ -11244,8 -11538,8 +11538,8 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+ $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@@ -11264,8 -11558,8 +11558,8 @@@ f
lt_prog_compiler_pic=
lt_prog_compiler_static=
- { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
- echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@@ -11299,7 -11593,7 +11593,7 @@@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@@ -11314,10 -11608,11 +11608,11 @@@
;;
hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
case $host_cpu in
- hppa*64*|ia64*)
+ hppa*64*)
# +Z the default
;;
*)
@@@ -11367,7 -11662,7 +11662,7 @@@
fi
;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@@ -11397,11 -11692,25 +11692,25 @@@
linux* | k*bsd*-gnu)
case $cc_basename in
- icc* | ecc* | ifort*)
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@@ -11521,8 -11830,8 +11830,8 @@@ case $host_os i
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
- { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
- echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+ $as_echo "$lt_prog_compiler_pic" >&6; }
@@@ -11533,10 -11842,10 +11842,10 @@@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@@ -11551,11 -11860,11 +11860,11 @@@
-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:11554: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11863: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11558: \$? = $ac_status" >&5
+ echo "$as_me:11867: \$? = $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.
@@@ -11568,8 -11877,8 +11877,8 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
@@@ -11592,10 -11901,10 +11901,10 @@@ f
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
@@@ -11620,8 -11929,8 +11929,8 @@@
LDFLAGS="$save_LDFLAGS"
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
@@@ -11635,10 -11944,10 +11944,10 @@@ f
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
@@@ -11656,11 -11965,11 +11965,11 @@@
-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:11659: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11663: \$? = $ac_status" >&5
+ echo "$as_me:11972: \$? = $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
@@@ -11682,18 -11991,18 +11991,18 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
@@@ -11711,11 -12020,11 +12020,11 @@@
-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:11714: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12023: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11718: \$? = $ac_status" >&5
+ echo "$as_me:12027: \$? = $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
@@@ -11737,8 -12046,8 +12046,8 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@@ -11746,19 -12055,19 +12055,19 @@@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
- echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
- echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@@ -11770,8 -12079,8 +12079,8 @@@ f
- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
allow_undefined_flag=
@@@ -11815,7 -12124,7 +12124,7 @@@
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@@ -11830,6 -12139,9 +12139,9 @@@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@@ -11902,7 -12214,7 +12214,7 @@@ _LT_EO
fi
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@@ -11968,6 -12280,9 +12280,9 @@@
tmp_addflag=' -i_dynamic -nofor_main' ;;
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
@@@ -12200,6 -12515,7 +12515,7 @@@ _LT_EO
fi
fi
+ export_dynamic_flag_spec='${wl}-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
@@@ -12230,18 -12546,21 +12546,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@@ -12256,12 -12575,13 +12575,13 @@@ if test -z "$aix_libpath"; the
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -12297,18 -12617,21 +12617,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@@ -12323,12 -12646,13 +12646,13 @@@ if test -z "$aix_libpath"; the
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -12366,7 -12690,7 +12690,7 @@@
export_dynamic_flag_spec=-rdynamic
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@@ -12397,7 -12721,11 +12721,11 @@@
whole_archive_flag_spec=''
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
- if test "$GCC" = "yes"; then
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
output_verbose_link_cmd=echo
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@@ -12489,7 -12817,7 +12817,7 @@@
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@@ -12547,27 -12875,31 +12875,31 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
@@@ -12825,8 -13157,8 +13157,8 @@@
fi
fi
- { echo "$as_me:$LINENO: result: $ld_shlibs" >&5
- echo "${ECHO_T}$ld_shlibs" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+ $as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@@ -12862,15 -13194,15 +13194,15 @@@ x|xyes
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
@@@ -12888,7 -13220,7 +13220,7 @@@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
archive_cmds_need_lc=no
@@@ -12900,8 -13232,8 +13232,8 @@@
cat conftest.err 1>&5
fi
$RM conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
- echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+ $as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
fi
@@@ -13064,8 -13396,8 +13396,8 @@@ esa
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
case $host_os in
@@@ -13227,14 -13559,14 +13559,14 @@@ bsdi[45]*
# libtool to hard-code these into programs
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@@ -13257,7 -13589,7 +13589,7 @@@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
- mingw*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@@ -13507,29 -13839,33 +13839,33 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
shlibpath_overrides_runpath=yes
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
@@@ -13738,7 -14074,7 +14074,7 @@@ tpf*
version_type=linux
need_lib_prefix=no
need_version=no
- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@@ -13755,8 -14091,8 +14091,8 @@@ uts4*
dynamic_linker=no
;;
esac
- { echo "$as_me:$LINENO: result: $dynamic_linker" >&5
- echo "${ECHO_T}$dynamic_linker" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@@ -13857,8 -14193,8 +14193,8 @@@ f
- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
@@@ -13882,8 -14218,8 +14218,8 @@@ els
# directories.
hardcode_action=unsupported
fi
- { echo "$as_me:$LINENO: result: $hardcode_action" >&5
- echo "${ECHO_T}$hardcode_action" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+ $as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
test "$inherit_rpath" = yes; then
@@@ -13915,7 -14251,7 +14251,7 @@@ els
lt_cv_dlopen_self=yes
;;
- mingw* | pw32*)
+ mingw* | pw32* | cegcc*)
lt_cv_dlopen="LoadLibrary"
lt_cv_dlopen_libs=
;;
@@@ -13927,10 -14263,10 +14263,10 @@@
darwin*)
# if libdl is installed we need to link against it
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
- echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
@@@ -13962,33 -14298,37 +14298,37 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@@ -14001,10 -14341,10 +14341,10 @@@ f
;;
*)
- { echo "$as_me:$LINENO: checking for shl_load" >&5
- echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+ $as_echo_n "checking for shl_load... " >&6; }
if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -14057,38 -14397,42 +14397,42 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_func_shl_load=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+ $as_echo "$ac_cv_func_shl_load" >&6; }
+ if test "x$ac_cv_func_shl_load" = x""yes; then
lt_cv_dlopen="shl_load"
else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
- echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
@@@ -14120,39 -14464,43 +14464,43 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dld_shl_load=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+ if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+ $as_echo_n "checking for dlopen... " >&6; }
if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@@ -14205,38 -14553,42 +14553,42 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_func_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+ $as_echo "$ac_cv_func_dlopen" >&6; }
+ if test "x$ac_cv_func_dlopen" = x""yes; then
lt_cv_dlopen="dlopen"
else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
- echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
@@@ -14268,39 -14620,43 +14620,43 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
@@@ -14332,39 -14688,43 +14688,43 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_svld_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+ if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
- echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
@@@ -14396,33 -14756,37 +14756,37 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dld_dld_link=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+ if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@@ -14461,10 -14825,10 +14825,10 @@@ f
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
- echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
@@@ -14472,7 -14836,7 +14836,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 14475 "configure"
+ #line 14839 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -14513,10 -14877,6 +14877,6 @@@
# endif
#endif
- #ifdef __cplusplus
- extern "C" void exit (int);
- #endif
-
void fnord() { int i=42;}
int main ()
{
@@@ -14532,13 -14892,13 +14892,13 @@@
else
puts (dlerror ());
- exit (status);
+ return status;
}
_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
@@@ -14556,15 -14916,15 +14916,15 @@@ rm -fr conftest
fi
- { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+ $as_echo "$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
@@@ -14572,7 -14932,7 +14932,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 14575 "configure"
+ #line 14935 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -14613,10 -14973,6 +14973,6 @@@
# endif
#endif
- #ifdef __cplusplus
- extern "C" void exit (int);
- #endif
-
void fnord() { int i=42;}
int main ()
{
@@@ -14632,13 -14988,13 +14988,13 @@@
else
puts (dlerror ());
- exit (status);
+ return status;
}
_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
@@@ -14656,8 -15012,8 +15012,8 @@@ rm -fr conftest
fi
- { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
- echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
CPPFLAGS="$save_CPPFLAGS"
@@@ -14695,13 -15051,13 +15051,13 @@@ f
striplib=
old_striplib=
- { echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
- echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
@@@ -14709,16 -15065,16 +15065,16 @@@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
;;
esac
fi
@@@ -14735,13 -15091,13 +15091,13 @@@
# Report which library types will actually be built
- { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $can_build_shared" >&5
- echo "${ECHO_T}$can_build_shared" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+ $as_echo "$can_build_shared" >&6; }
- { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
- echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@@ -14761,15 -15117,15 +15117,15 @@@
fi
;;
esac
- { echo "$as_me:$LINENO: result: $enable_shared" >&5
- echo "${ECHO_T}$enable_shared" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+ $as_echo "$enable_shared" >&6; }
- { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
- echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
- { echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
@@@ -14918,8 -15274,8 +15274,8 @@@ f
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
- echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@@ -14948,14 -15304,14 +15304,14 @@@
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
- echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
- echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@@ -14985,19 -15341,19 +15341,19 @@@ f
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ $as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ $as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
- { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
- echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@@ -15009,8 -15365,8 +15365,8 @@@
;;
esac
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
- echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@@ -15064,8 -15420,8 +15420,8 @@@
fi
# PORTME: fill in a description of your system's C++ link characteristics
- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@@ -15154,6 -15510,7 +15510,7 @@@
fi
fi
+ export_dynamic_flag_spec_CXX='${wl}-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
@@@ -15185,18 -15542,21 +15542,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@@ -15211,12 -15571,13 +15571,13 @@@ if test -z "$aix_libpath"; the
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -15253,18 -15614,21 +15614,21 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@@ -15279,12 -15643,13 +15643,13 @@@ if test -z "$aix_libpath"; the
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -15324,7 -15689,7 +15689,7 @@@
esac
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@@ -15357,7 -15722,11 +15722,11 @@@
whole_archive_flag_spec_CXX=''
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
- if test "$GCC" = "yes"; then
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
output_verbose_link_cmd=echo
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@@ -16026,8 -16395,8 +16395,8 @@@
;;
esac
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
@@@ -16057,7 -16426,7 +16426,7 @@@ _LT_EO
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@@ -16239,8 -16608,8 +16608,8 @@@ f
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
- { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
- echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@@ -16274,7 -16643,7 +16643,7 @@@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@@ -16300,10 -16669,11 +16669,11 @@@
fi
;;
hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
case $host_cpu in
- hppa*64*|ia64*)
+ hppa*64*)
;;
*)
lt_prog_compiler_pic_CXX='-fPIC'
@@@ -16401,12 -16771,19 +16771,19 @@@
lt_prog_compiler_wl_CXX='--backend -Wl,'
lt_prog_compiler_pic_CXX='-fPIC'
;;
- icpc* | ecpc* )
- # Intel C++
+ ecpc* )
+ # old Intel C++ for x86_64 which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
+ icpc* )
+ # Intel C++, used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
lt_prog_compiler_wl_CXX='-Wl,'
@@@ -16548,8 -16925,8 +16925,8 @@@ case $host_os i
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
- { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
- echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
@@@ -16557,10 -16934,10 +16934,10 @@@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@@ -16575,11 -16952,11 +16952,11 @@@
-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:16578: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16955: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16582: \$? = $ac_status" >&5
+ echo "$as_me:16959: \$? = $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.
@@@ -16592,8 -16969,8 +16969,8 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
@@@ -16613,10 -16990,10 +16990,10 @@@ f
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
@@@ -16641,8 -17018,8 +17018,8 @@@
LDFLAGS="$save_LDFLAGS"
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
@@@ -16653,10 -17030,10 +17030,10 @@@ f
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
@@@ -16674,11 -17051,11 +17051,11 @@@
-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:16677: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17054: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16681: \$? = $ac_status" >&5
+ echo "$as_me:17058: \$? = $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
@@@ -16700,15 -17077,15 +17077,15 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
@@@ -16726,11 -17103,11 +17103,11 @@@
-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:16729: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17106: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16733: \$? = $ac_status" >&5
+ echo "$as_me:17110: \$? = $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
@@@ -16752,8 -17129,8 +17129,8 @@@
$RM conftest*
fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@@ -16761,19 -17138,19 +17138,19 @@@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
- echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
- echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@@ -16782,8 -17159,8 +17159,8 @@@ f
- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@@ -16799,7 -17176,7 +17176,7 @@@
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
- cygwin* | mingw*)
+ 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)
@@@ -16811,8 -17188,8 +17188,8 @@@
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@@ -16839,15 -17216,15 +17216,15 @@@ x|xyes
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
@@@ -16865,7 -17242,7 +17242,7 @@@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
@@@ -16877,8 -17254,8 +17254,8 @@@
cat conftest.err 1>&5
fi
$RM conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
- echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+ $as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
fi
@@@ -16948,8 -17325,8 +17325,8 @@@ esa
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
@@@ -17060,14 -17437,14 +17437,14 @@@ bsdi[45]*
# libtool to hard-code these into programs
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@@ -17090,7 -17467,7 +17467,7 @@@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
- mingw*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@@ -17339,29 -17716,33 +17716,33 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
shlibpath_overrides_runpath=yes
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
@@@ -17570,7 -17951,7 +17951,7 @@@ tpf*
version_type=linux
need_lib_prefix=no
need_version=no
- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@@ -17587,8 -17968,8 +17968,8 @@@ uts4*
dynamic_linker=no
;;
esac
- { echo "$as_me:$LINENO: result: $dynamic_linker" >&5
- echo "${ECHO_T}$dynamic_linker" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@@ -17638,8 -18019,8 +18019,8 @@@ f
- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
@@@ -17663,8 -18044,8 +18044,8 @@@ els
# directories.
hardcode_action_CXX=unsupported
fi
- { echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
- echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+ $as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
test "$inherit_rpath_CXX" = yes; then
@@@ -17728,10 -18109,10 +18109,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
# Josh Triplett <josh at freedesktop.org>
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_DOLT_BASH+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $DOLT_BASH in
[\\/]* | ?:[\\/]*)
@@@ -17746,7 -18127,7 +18127,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -17758,16 -18139,16 +18139,16 @@@ esa
fi
DOLT_BASH=$ac_cv_path_DOLT_BASH
if test -n "$DOLT_BASH"; then
- { echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
- echo "${ECHO_T}$DOLT_BASH" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
+ $as_echo "$DOLT_BASH" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
- { echo "$as_me:$LINENO: checking if dolt supports this host" >&5
- echo $ECHO_N "checking if dolt supports this host... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5
+ $as_echo_n "checking if dolt supports this host... " >&6; }
dolt_supported=yes
if test x$DOLT_BASH = x; then
dolt_supported=no
@@@ -17791,13 -18172,13 +18172,13 @@@ i?86-apple-darwin*
;;
esac
if test x$dolt_supported = xno ; then
- { echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
- echo "${ECHO_T}no, falling back to libtool" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
+ $as_echo "no, falling back to libtool" >&6; }
LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
else
- { echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
- echo "${ECHO_T}yes, replacing libtool" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
+ $as_echo "yes, replacing libtool" >&6; }
cat <<__DOLTCOMPILE__EOF__ >doltcompile
#!$DOLT_BASH
@@@ -17925,10 -18306,10 +18306,10 @@@ f
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_FLEX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $FLEX in
[\\/]* | ?:[\\/]*)
@@@ -17943,7 -18324,7 +18324,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -17955,17 -18336,17 +18336,17 @@@ esa
fi
FLEX=$ac_cv_path_FLEX
if test -n "$FLEX"; then
- { echo "$as_me:$LINENO: result: $FLEX" >&5
- echo "${ECHO_T}$FLEX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $FLEX" >&5
+ $as_echo "$FLEX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$FLEX"; then
- { { echo "$as_me:$LINENO: error: You need the 'flex' lexer generator to compile WebKit" >&5
- echo "$as_me: error: You need the 'flex' lexer generator to compile WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need the 'flex' lexer generator to compile WebKit" >&5
+ $as_echo "$as_me: error: You need the 'flex' lexer generator to compile WebKit" >&2;}
{ (exit 1); exit 1; }; }
else
FLEX_VERSION=`$FLEX --version | sed 's,.*\ \(0-9*\.0-9*\.0-9*\)$,\1,'`
@@@ -17974,10 -18355,10 +18355,10 @@@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@@ -17990,7 -18371,7 +18371,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -18001,11 -18382,11 +18382,11 @@@ f
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -18042,18 -18423,18 +18423,18 @@@ x$ax_compare_version_B" | sed 's/^ *//
if test "$ax_compare_version" = "true" ; then
- { echo "$as_me:$LINENO: WARNING: You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly" >&5
- echo "$as_me: WARNING: You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly" >&5
+ $as_echo "$as_me: WARNING: You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly" >&2;}
fi
fi
# Extract the first word of "gperf", so it can be a program name with args.
set dummy gperf; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_GPERF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $GPERF in
[\\/]* | ?:[\\/]*)
@@@ -18068,7 -18449,7 +18449,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -18080,17 -18461,17 +18461,17 @@@ esa
fi
GPERF=$ac_cv_path_GPERF
if test -n "$GPERF"; then
- { echo "$as_me:$LINENO: result: $GPERF" >&5
- echo "${ECHO_T}$GPERF" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $GPERF" >&5
+ $as_echo "$GPERF" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$GPERF"; then
- { { echo "$as_me:$LINENO: error: You need the 'gperf' hash function generator to compile WebKit" >&5
- echo "$as_me: error: You need the 'gperf' hash function generator to compile WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need the 'gperf' hash function generator to compile WebKit" >&5
+ $as_echo "$as_me: error: You need the 'gperf' hash function generator to compile WebKit" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -18099,20 -18480,21 +18480,21 @@@ if test "$os_win32" = "no"; the
for ac_header in pthread.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ $as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
else
# Is the header compilable?
- { echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ $as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18128,32 -18510,33 +18510,33 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
# Is the header present?
- { echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ $as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18167,51 -18550,52 +18550,52 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ $as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ $as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+ $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+ $as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------- ##
## Report this to http://bugs.webkit.org/ ##
@@@ -18220,21 -18604,24 +18604,24 @@@ _ASBO
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ $as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
@@@ -18242,8 -18629,8 +18629,8 @@@
_ACEOF
else
- { { echo "$as_me:$LINENO: error: pthread support is required to build WebKit" >&5
- echo "$as_me: error: pthread support is required to build WebKit" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: pthread support is required to build WebKit" >&5
+ $as_echo "$as_me: error: pthread support is required to build WebKit" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -18252,10 -18639,10 +18639,10 @@@ don
fi
# check for libjpeg the way Gtk does it.
- { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
- echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
+ $as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ljpeg $LIBS"
@@@ -18287,44 -18674,48 +18674,48 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
- echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
- if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
+ $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
+ if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then
jpeg_ok=yes
else
jpeg_ok=no
- { { echo "$as_me:$LINENO: error: JPEG library (libjpeg) not found" >&5
- echo "$as_me: error: JPEG library (libjpeg) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: JPEG library (libjpeg) not found" >&5
+ $as_echo "$as_me: error: JPEG library (libjpeg) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$jpeg_ok" = yes; then
- { echo "$as_me:$LINENO: checking for jpeglib" >&5
- echo $ECHO_N "checking for jpeglib... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for jpeglib" >&5
+ $as_echo_n "checking for jpeglib... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18342,53 -18733,54 +18733,54 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
jpeg_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
jpeg_ok=no
fi
rm -f conftest.err conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $jpeg_ok" >&5
- echo "${ECHO_T}$jpeg_ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5
+ $as_echo "$jpeg_ok" >&6; }
if test "$jpeg_ok" = yes; then
JPEG_LIBS="-ljpeg"
# should we check for progressive JPEG like GTK+ as well?
else
- { { echo "$as_me:$LINENO: error: JPEG library (libjpeg) not found" >&5
- echo "$as_me: error: JPEG library (libjpeg) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: JPEG library (libjpeg) not found" >&5
+ $as_echo "$as_me: error: JPEG library (libjpeg) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
# Check for libpng the way Gtk+ does it
- { echo "$as_me:$LINENO: checking for libpng12" >&5
- echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libpng12" >&5
+ $as_echo_n "checking for libpng12... " >&6; }
if $PKG_CONFIG --exists libpng12 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
PNG_LIBS=`$PKG_CONFIG --libs libpng12`
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
- echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
+ $as_echo_n "checking for png_read_info in -lpng... " >&6; }
if test "${ac_cv_lib_png_png_read_info+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng -lz -lm $LIBS"
@@@ -18420,45 -18812,49 +18812,49 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_png_png_read_info=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_png_png_read_info=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5
- echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; }
- if test $ac_cv_lib_png_png_read_info = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5
+ $as_echo "$ac_cv_lib_png_png_read_info" >&6; }
+ if test "x$ac_cv_lib_png_png_read_info" = x""yes; then
if test "${ac_cv_header_png_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for png.h" >&5
- echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for png.h" >&5
+ $as_echo_n "checking for png.h... " >&6; }
if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
- echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+ $as_echo "$ac_cv_header_png_h" >&6; }
else
# Is the header compilable?
- { echo "$as_me:$LINENO: checking png.h usability" >&5
- echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking png.h usability" >&5
+ $as_echo_n "checking png.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18474,32 -18870,33 +18870,33 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
# Is the header present?
- { echo "$as_me:$LINENO: checking png.h presence" >&5
- echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking png.h presence" >&5
+ $as_echo_n "checking png.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18513,51 -18910,52 +18910,52 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ $as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
+ $as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
+ $as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
+ $as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
+ $as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
+ $as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
+ $as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------- ##
## Report this to http://bugs.webkit.org/ ##
@@@ -18566,18 -18964,18 +18964,18 @@@ _ASBO
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
- { echo "$as_me:$LINENO: checking for png.h" >&5
- echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for png.h" >&5
+ $as_echo_n "checking for png.h... " >&6; }
if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_header_png_h=$ac_header_preproc
fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
- echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+ $as_echo "$ac_cv_header_png_h" >&6; }
fi
- if test $ac_cv_header_png_h = yes; then
+ if test "x$ac_cv_header_png_h" = x""yes; then
png_ok=yes
else
png_ok=no
@@@ -18585,14 -18983,14 +18983,14 @@@ f
else
- { { echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
- echo "$as_me: error: PNG library (libpng) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
+ $as_echo "$as_me: error: PNG library (libpng) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$png_ok" = yes; then
- { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
- echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
+ $as_echo_n "checking for png_structp in png.h... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@@ -18614,46 -19012,47 +19012,47 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
png_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
png_ok=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $png_ok" >&5
- echo "${ECHO_T}$png_ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $png_ok" >&5
+ $as_echo "$png_ok" >&6; }
if test "$png_ok" = yes; then
PNG_LIBS='-lpng -lz'
else
- { { echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
- echo "$as_me: error: PNG library (libpng) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
+ $as_echo "$as_me: error: PNG library (libpng) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
else
- { { echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
- echo "$as_me: error: PNG library (libpng) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: PNG library (libpng) not found" >&5
+ $as_echo "$as_me: error: PNG library (libpng) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
# determine the GDK/GTK+ target
- { echo "$as_me:$LINENO: checking the target windowing system" >&5
- echo $ECHO_N "checking the target windowing system... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking the target windowing system" >&5
+ $as_echo_n "checking the target windowing system... " >&6; }
# Check whether --with-target was given.
if test "${with_target+set}" = set; then
@@@ -18665,16 -19064,16 +19064,16 @@@ f
case "$with_target" in
x11|win32|quartz|directfb) ;;
- *) { { echo "$as_me:$LINENO: error: Invalid target: must be x11, quartz, win32, or directfb." >&5
- echo "$as_me: error: Invalid target: must be x11, quartz, win32, or directfb." >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: Invalid target: must be x11, quartz, win32, or directfb." >&5
+ $as_echo "$as_me: error: Invalid target: must be x11, quartz, win32, or directfb." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
- { echo "$as_me:$LINENO: result: $with_target" >&5
- echo "${ECHO_T}$with_target" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $with_target" >&5
+ $as_echo "$with_target" >&6; }
- { echo "$as_me:$LINENO: checking for Hildon UI extensions" >&5
- echo $ECHO_N "checking for Hildon UI extensions... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Hildon UI extensions" >&5
+ $as_echo_n "checking for Hildon UI extensions... " >&6; }
# Check whether --with-hildon was given.
if test "${with_hildon+set}" = set; then
@@@ -18683,8 -19082,8 +19082,8 @@@ els
with_hildon="no"
fi
- { echo "$as_me:$LINENO: result: $with_hildon" >&5
- echo "${ECHO_T}$with_hildon" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $with_hildon" >&5
+ $as_echo "$with_hildon" >&6; }
if test "$with_hildon" = "yes"; then
HILDON_CPPFLAGS="-DMAEMO_CHANGES"
@@@ -18694,10 -19093,10 +19093,10 @@@ if test "x$ac_cv_env_PKG_CONFIG_set" !
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@@ -18712,7 -19111,7 +19111,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -18724,11 -19123,11 +19123,11 @@@ esa
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
@@@ -18737,10 -19136,10 +19136,10 @@@ if test -z "$ac_cv_path_PKG_CONFIG"; th
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@@ -18755,7 -19154,7 +19154,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -18767,11 -19166,11 +19166,11 @@@ esa
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
@@@ -18779,12 -19178,8 +19178,8 @@@
else
case $cross_compiling:$ac_tool_warned in
yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet. If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_pt_PKG_CONFIG
@@@ -18796,32 -19191,32 +19191,32 @@@ f
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
- echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
pkg_failed=no
- { echo "$as_me:$LINENO: checking for HILDON" >&5
- echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1" 2>/dev/null`
else
@@@ -18836,10 -19231,10 +19231,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_HILDON_LIBS="$HILDON_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1\"") >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1" 2>/dev/null`
else
@@@ -18867,7 -19262,7 +19262,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$HILDON_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (hildon-1) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (hildon-1) were not met:
$HILDON_PKG_ERRORS
@@@ -18878,7 -19273,7 +19273,7 @@@ Alternatively, you may set the environm
and HILDON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (hildon-1) were not met:
+ $as_echo "$as_me: error: Package requirements (hildon-1) were not met:
$HILDON_PKG_ERRORS
@@@ -18891,7 -19286,9 +19286,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -18901,7 -19298,7 +19298,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -18911,12 -19308,12 +19308,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS
HILDON_LIBS=$pkg_cv_HILDON_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -18932,7 -19329,7 +19329,7 @@@ LIBXML_REQUIRED_VERSION=2.
# minimum GTK+ base dependencies
PANGO_REQUIRED_VERSION=1.0
- GTK_REQUIRED_VERSION=2.8
+ GTK_REQUIRED_VERSION=2.10
# optional modules
LIBSOUP_REQUIRED_VERSION=2.25.91
@@@ -18957,22 -19354,22 +19354,22 @@@ GTHREAD_REQUIRED_VERSION=2.
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GLIB" >&5
- echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
+ { ($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
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
gthread-2.0 >= $GTHREAD_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
@@@ -18989,14 -19386,14 +19386,14 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
+ { ($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
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
gthread-2.0 >= $GTHREAD_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
@@@ -19030,7 -19427,7 +19427,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
gthread-2.0 >= $GTHREAD_REQUIRED_VERSION) were not met:
@@@ -19043,7 -19440,7 +19440,7 @@@ Alternatively, you may set the environm
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
+ $as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
gthread-2.0 >= $GTHREAD_REQUIRED_VERSION) were not met:
@@@ -19058,7 -19455,9 +19455,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19068,7 -19467,7 +19467,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19078,12 -19477,12 +19477,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -19093,10 -19492,10 +19492,10 @@@
# Check for glib-genmarshal and glib-mkenums
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
@@@ -19111,7 -19510,7 +19510,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -19123,20 -19522,20 +19522,20 @@@ esa
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
- { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
- echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
+ $as_echo "$GLIB_GENMARSHAL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
# Extract the first word of "glib-mkenums", so it can be a program name with args.
set dummy glib-mkenums; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
[\\/]* | ?:[\\/]*)
@@@ -19151,7 -19550,7 +19550,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -19163,22 -19562,22 +19562,22 @@@ esa
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
- { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
- echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
+ $as_echo "$GLIB_MKENUMS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
- { { echo "$as_me:$LINENO: error: You need the GLib dev tools in your path" >&5
- echo "$as_me: error: You need the GLib dev tools in your path" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You need the GLib dev tools in your path" >&5
+ $as_echo "$as_me: error: You need the GLib dev tools in your path" >&2;}
{ (exit 1); exit 1; }; }
fi
;;
- unicode) { echo "$as_me:$LINENO: checking which Unicode backend to use" >&5
- echo $ECHO_N "checking which Unicode backend to use... $ECHO_C" >&6; }
+ unicode) { $as_echo "$as_me:$LINENO: checking which Unicode backend to use" >&5
+ $as_echo_n "checking which Unicode backend to use... " >&6; }
# Check whether --with-unicode_backend was given.
if test "${with_unicode_backend+set}" = set; then
@@@ -19190,12 -19589,12 +19589,12 @@@ f
case "$unicode_backend" in
icu) ;;
- *) { { echo "$as_me:$LINENO: error: Invalid Unicode backend: must be icu." >&5
- echo "$as_me: error: Invalid Unicode backend: must be icu." >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: Invalid Unicode backend: must be icu." >&5
+ $as_echo "$as_me: error: Invalid Unicode backend: must be icu." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
- { echo "$as_me:$LINENO: result: $unicode_backend" >&5
- echo "${ECHO_T}$unicode_backend" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $unicode_backend" >&5
+ $as_echo "$unicode_backend" >&6; }
if test "$unicode_backend" = "icu"; then
if test "$os_darwin" = "yes"; then
@@@ -19207,10 -19606,10 +19606,10 @@@
else
# Extract the first word of "icu-config", so it can be a program name with args.
set dummy icu-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_icu_config+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $icu_config in
[\\/]* | ?:[\\/]*)
@@@ -19225,7 -19624,7 +19624,7 @@@ d
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_icu_config="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@@ -19238,17 -19637,17 +19637,17 @@@ esa
fi
icu_config=$ac_cv_path_icu_config
if test -n "$icu_config"; then
- { echo "$as_me:$LINENO: result: $icu_config" >&5
- echo "${ECHO_T}$icu_config" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $icu_config" >&5
+ $as_echo "$icu_config" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
fi
if test "$icu_config" = "no"; then
- { { echo "$as_me:$LINENO: error: Cannot find icu-config. The ICU library is needed." >&5
- echo "$as_me: error: Cannot find icu-config. The ICU library is needed." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Cannot find icu-config. The ICU library is needed." >&5
+ $as_echo "$as_me: error: Cannot find icu-config. The ICU library is needed." >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -19262,28 -19661,36 +19661,36 @@@ f
;;
- *) { { echo "$as_me:$LINENO: error: I don't support that module. Sorry.." >&5
- echo "$as_me: error: I don't support that module. Sorry.." >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: I don't support that module. Sorry.." >&5
+ $as_echo "$as_me: error: I don't support that module. Sorry.." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
done
+ GETTEXT_PACKAGE=$PACKAGE
+
+
+ cat >>confdefs.h <<_ACEOF
+ #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+ _ACEOF
+
+
pkg_failed=no
- { echo "$as_me:$LINENO: checking for LIBXML" >&5
- echo $ECHO_N "checking for LIBXML... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19298,10 -19705,10 +19705,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19329,7 -19736,7 +19736,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBXML_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
$LIBXML_PKG_ERRORS
@@@ -19340,7 -19747,7 +19747,7 @@@ Alternatively, you may set the environm
and LIBXML_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED_VERSION) were not met:
$LIBXML_PKG_ERRORS
@@@ -19353,7 -19760,9 +19760,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19363,7 -19772,7 +19772,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19373,12 -19782,12 +19782,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -19386,20 -19795,20 +19795,20 @@@
pkg_failed=no
- { echo "$as_me:$LINENO: checking for PANGO" >&5
- echo $ECHO_N "checking for PANGO... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
+ { ($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
pangoft2") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED_VERSION
pangoft2" 2>/dev/null`
@@@ -19415,12 -19824,12 +19824,12 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_PANGO_LIBS="$PANGO_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
+ { ($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
pangoft2") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED_VERSION
pangoft2" 2>/dev/null`
@@@ -19451,7 -19860,7 +19860,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$PANGO_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED_VERSION
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED_VERSION
pangoft2) were not met:
$PANGO_PKG_ERRORS
@@@ -19463,7 -19872,7 +19872,7 @@@ Alternatively, you may set the environm
and PANGO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED_VERSION
+ $as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED_VERSION
pangoft2) were not met:
$PANGO_PKG_ERRORS
@@@ -19477,7 -19886,9 +19886,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19487,7 -19898,7 +19898,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19497,12 -19908,12 +19908,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
PANGO_LIBS=$pkg_cv_PANGO_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -19512,18 -19923,18 +19923,18 @@@
if test "$with_target" = "directfb"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for CAIRO" >&5
- echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19538,10 -19949,10 +19949,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19569,7 -19980,7 +19980,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (cairo-directfb >= $CAIRO_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (cairo-directfb >= $CAIRO_REQUIRED_VERSION) were not met:
$CAIRO_PKG_ERRORS
@@@ -19580,7 -19991,7 +19991,7 @@@ Alternatively, you may set the environm
and CAIRO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (cairo-directfb >= $CAIRO_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (cairo-directfb >= $CAIRO_REQUIRED_VERSION) were not met:
$CAIRO_PKG_ERRORS
@@@ -19593,7 -20004,9 +20004,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19603,7 -20016,7 +20016,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19613,28 -20026,28 +20026,28 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GTK" >&5
- echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19649,10 -20062,10 +20062,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GTK_LIBS="$GTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19680,7 -20093,7 +20093,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) were not met:
$GTK_PKG_ERRORS
@@@ -19691,7 -20104,7 +20104,7 @@@ Alternatively, you may set the environm
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) were not met:
$GTK_PKG_ERRORS
@@@ -19704,7 -20117,9 +20117,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19714,7 -20129,7 +20129,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19724,12 -20139,12 +20139,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -19740,18 -20155,18 +20155,18 @@@ _ACEO
else
pkg_failed=no
- { echo "$as_me:$LINENO: checking for CAIRO" >&5
- echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19766,10 -20181,10 +20181,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19797,7 -20212,7 +20212,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (cairo >= $CAIRO_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (cairo >= $CAIRO_REQUIRED_VERSION) were not met:
$CAIRO_PKG_ERRORS
@@@ -19808,7 -20223,7 +20223,7 @@@ Alternatively, you may set the environm
and CAIRO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (cairo >= $CAIRO_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (cairo >= $CAIRO_REQUIRED_VERSION) were not met:
$CAIRO_PKG_ERRORS
@@@ -19821,7 -20236,9 +20236,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19831,7 -20248,7 +20248,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19841,28 -20258,28 +20258,28 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GTK" >&5
- echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19877,10 -20294,10 +20294,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GTK_LIBS="$GTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -19908,7 -20325,7 +20325,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met:
$GTK_PKG_ERRORS
@@@ -19919,7 -20336,7 +20336,7 @@@ Alternatively, you may set the environm
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met:
$GTK_PKG_ERRORS
@@@ -19932,7 -20349,9 +20349,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -19942,7 -20361,7 +20361,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -19952,12 -20371,12 +20371,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -19965,18 -20384,18 +20384,18 @@@
# check for XT
pkg_failed=no
- { echo "$as_me:$LINENO: checking for XT" >&5
- echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
else
@@@ -19991,10 -20410,10 +20410,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_XT_LIBS="$XT_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
else
@@@ -20022,16 -20441,16 +20441,16 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$XT_PKG_ERRORS" >&5
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
xt_has_pkg_config=no
elif test $pkg_failed = untried; then
xt_has_pkg_config=no
else
XT_CFLAGS=$pkg_cv_XT_CFLAGS
XT_LIBS=$pkg_cv_XT_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
xt_has_pkg_config=yes
fi
# some old versions of Xt do not provide xt.pc, so try to link against Xt
@@@ -20040,10 -20459,10 +20459,10 @@@
# using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as
# we don't care about the XtOpenDisplay symbol but only about the
# existence of libXt
- { echo "$as_me:$LINENO: checking for XtOpenDisplay in -lXt" >&5
- echo $ECHO_N "checking for XtOpenDisplay in -lXt... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for XtOpenDisplay in -lXt" >&5
+ $as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; }
if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
@@@ -20075,37 -20494,41 +20494,41 @@@ case "(($ac_try" i
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xt_XtOpenDisplay=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xt_XtOpenDisplay=no
fi
+ rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
- if test $ac_cv_lib_Xt_XtOpenDisplay = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
+ $as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
+ if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then
XT_CFLAGS=""; XT_LIBS="-lXt"
else
- { { echo "$as_me:$LINENO: error: X Toolkit Intrinsics library (libXt) not found" >&5
- echo "$as_me: error: X Toolkit Intrinsics library (libXt) not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: X Toolkit Intrinsics library (libXt) not found" >&5
+ $as_echo "$as_me: error: X Toolkit Intrinsics library (libXt) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -20125,8 -20548,8 +20548,8 @@@ f
# check whether to build with debugging enabled
- { echo "$as_me:$LINENO: checking whether to do a debug build" >&5
- echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to do a debug build" >&5
+ $as_echo_n "checking whether to do a debug build... " >&6; }
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
enableval=$enable_debug;
@@@ -20134,12 -20557,12 +20557,12 @@@ els
enable_debug="no"
fi
- { echo "$as_me:$LINENO: result: $enable_debug" >&5
- echo "${ECHO_T}$enable_debug" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5
+ $as_echo "$enable_debug" >&6; }
# check whether to enable optimized builds
- { echo "$as_me:$LINENO: checking whether to enable optimized builds" >&5
- echo $ECHO_N "checking whether to enable optimized builds... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable optimized builds" >&5
+ $as_echo_n "checking whether to enable optimized builds... " >&6; }
# Check whether --enable-optimizations was given.
if test "${enable_optimizations+set}" = set; then
enableval=$enable_optimizations; enable_optimizations=$enableval
@@@ -20147,12 -20570,12 +20570,12 @@@ els
if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi
fi
- { echo "$as_me:$LINENO: result: $enable_optimizations" >&5
- echo "${ECHO_T}$enable_optimizations" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_optimizations" >&5
+ $as_echo "$enable_optimizations" >&6; }
# check whether to enable dashboard support
- { echo "$as_me:$LINENO: checking whether to enable Dashboard support" >&5
- echo $ECHO_N "checking whether to enable Dashboard support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable Dashboard support" >&5
+ $as_echo_n "checking whether to enable Dashboard support... " >&6; }
# Check whether --enable-dashboard_support was given.
if test "${enable_dashboard_support+set}" = set; then
enableval=$enable_dashboard_support;
@@@ -20160,12 -20583,12 +20583,12 @@@ els
enable_dashboard_support="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_dashboard_support" >&5
- echo "${ECHO_T}$enable_dashboard_support" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_dashboard_support" >&5
+ $as_echo "$enable_dashboard_support" >&6; }
# check whether to enable 3D transforms support
- { echo "$as_me:$LINENO: checking whether to enable support for 3D Transforms" >&5
- echo $ECHO_N "checking whether to enable support for 3D Transforms... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for 3D Transforms" >&5
+ $as_echo_n "checking whether to enable support for 3D Transforms... " >&6; }
# Check whether --enable-3D_transforms was given.
if test "${enable_3D_transforms+set}" = set; then
enableval=$enable_3D_transforms;
@@@ -20173,12 -20596,12 +20596,12 @@@ els
enable_3D_transforms="no"
fi
- { echo "$as_me:$LINENO: result: $enable_3D_transforms" >&5
- echo "${ECHO_T}$enable_3D_transforms" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_3D_transforms" >&5
+ $as_echo "$enable_3D_transforms" >&6; }
# check whether to enable channel messaging support
- { echo "$as_me:$LINENO: checking whether to enable HTML5 Channel Messaging support" >&5
- echo $ECHO_N "checking whether to enable HTML5 Channel Messaging support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable HTML5 Channel Messaging support" >&5
+ $as_echo_n "checking whether to enable HTML5 Channel Messaging support... " >&6; }
# Check whether --enable-channel_messaging was given.
if test "${enable_channel_messaging+set}" = set; then
enableval=$enable_channel_messaging;
@@@ -20186,12 -20609,12 +20609,12 @@@ els
enable_channel_messaging="no"
fi
- { echo "$as_me:$LINENO: result: $enable_channel_messaging" >&5
- echo "${ECHO_T}$enable_channel_messaging" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_channel_messaging" >&5
+ $as_echo "$enable_channel_messaging" >&6; }
# check whether to enable HTML5 Offline Web Applications support
- { echo "$as_me:$LINENO: checking whether to enable HTML5 offline web applications support" >&5
- echo $ECHO_N "checking whether to enable HTML5 offline web applications support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable HTML5 offline web applications support" >&5
+ $as_echo_n "checking whether to enable HTML5 offline web applications support... " >&6; }
# Check whether --enable-offline_web_applications was given.
if test "${enable_offline_web_applications+set}" = set; then
enableval=$enable_offline_web_applications;
@@@ -20199,12 -20622,12 +20622,12 @@@ els
enable_offline_web_applications="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_offline_web_applications" >&5
- echo "${ECHO_T}$enable_offline_web_applications" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_offline_web_applications" >&5
+ $as_echo "$enable_offline_web_applications" >&6; }
# check whether to enable HTML5 client-side session and persitent storage support
- { echo "$as_me:$LINENO: checking whether to enable HTML5 client-side session and persistent storage support" >&5
- echo $ECHO_N "checking whether to enable HTML5 client-side session and persistent storage support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable HTML5 client-side session and persistent storage support" >&5
+ $as_echo_n "checking whether to enable HTML5 client-side session and persistent storage support... " >&6; }
# Check whether --enable-dom_storage was given.
if test "${enable_dom_storage+set}" = set; then
enableval=$enable_dom_storage;
@@@ -20212,12 -20635,12 +20635,12 @@@ els
enable_dom_storage="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_dom_storage" >&5
- echo "${ECHO_T}$enable_dom_storage" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_dom_storage" >&5
+ $as_echo "$enable_dom_storage" >&6; }
# check whether to build with database support
- { echo "$as_me:$LINENO: checking whether to enable HTML5 client-side database storage support" >&5
- echo $ECHO_N "checking whether to enable HTML5 client-side database storage support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable HTML5 client-side database storage support" >&5
+ $as_echo_n "checking whether to enable HTML5 client-side database storage support... " >&6; }
# Check whether --enable-database was given.
if test "${enable_database+set}" = set; then
enableval=$enable_database;
@@@ -20225,12 -20648,12 +20648,12 @@@ els
enable_database="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_database" >&5
- echo "${ECHO_T}$enable_database" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_database" >&5
+ $as_echo "$enable_database" >&6; }
# check whether to build with icon database support
- { echo "$as_me:$LINENO: checking whether to enable icon database support" >&5
- echo $ECHO_N "checking whether to enable icon database support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable icon database support" >&5
+ $as_echo_n "checking whether to enable icon database support... " >&6; }
# Check whether --enable-icon_database was given.
if test "${enable_icon_database+set}" = set; then
enableval=$enable_icon_database;
@@@ -20238,12 -20661,12 +20661,12 @@@ els
enable_icon_database="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_icon_database" >&5
- echo "${ECHO_T}$enable_icon_database" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_icon_database" >&5
+ $as_echo "$enable_icon_database" >&6; }
# check whether to enable HTML5 audio/video support
- { echo "$as_me:$LINENO: checking whether to enable HTML5 video support" >&5
- echo $ECHO_N "checking whether to enable HTML5 video support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable HTML5 video support" >&5
+ $as_echo_n "checking whether to enable HTML5 video support... " >&6; }
# Check whether --enable-video was given.
if test "${enable_video+set}" = set; then
enableval=$enable_video;
@@@ -20251,12 -20674,12 +20674,12 @@@ els
enable_video="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_video" >&5
- echo "${ECHO_T}$enable_video" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_video" >&5
+ $as_echo "$enable_video" >&6; }
# check whether to enable XPath support
- { echo "$as_me:$LINENO: checking whether to enable XPath support" >&5
- echo $ECHO_N "checking whether to enable XPath support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable XPath support" >&5
+ $as_echo_n "checking whether to enable XPath support... " >&6; }
# Check whether --enable-xpath was given.
if test "${enable_xpath+set}" = set; then
enableval=$enable_xpath;
@@@ -20264,12 -20687,12 +20687,12 @@@ els
enable_xpath="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_xpath" >&5
- echo "${ECHO_T}$enable_xpath" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_xpath" >&5
+ $as_echo "$enable_xpath" >&6; }
# check whether to enable XSLT support
- { echo "$as_me:$LINENO: checking whether to enable XSLT support" >&5
- echo $ECHO_N "checking whether to enable XSLT support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable XSLT support" >&5
+ $as_echo_n "checking whether to enable XSLT support... " >&6; }
# Check whether --enable-xslt was given.
if test "${enable_xslt+set}" = set; then
enableval=$enable_xslt;
@@@ -20277,12 -20700,12 +20700,12 @@@ els
enable_xslt="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_xslt" >&5
- echo "${ECHO_T}$enable_xslt" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_xslt" >&5
+ $as_echo "$enable_xslt" >&6; }
# check whether to enable geolocation support
- { echo "$as_me:$LINENO: checking whether to enable geolocation support" >&5
- echo $ECHO_N "checking whether to enable geolocation support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable geolocation support" >&5
+ $as_echo_n "checking whether to enable geolocation support... " >&6; }
# Check whether --enable-geolocation was given.
if test "${enable_geolocation+set}" = set; then
enableval=$enable_geolocation;
@@@ -20290,12 -20713,12 +20713,12 @@@ els
enable_geolocation="no"
fi
- { echo "$as_me:$LINENO: result: $enable_geolocation" >&5
- echo "${ECHO_T}$enable_geolocation" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_geolocation" >&5
+ $as_echo "$enable_geolocation" >&6; }
# check whether to enable gnomekeyring support
- { echo "$as_me:$LINENO: checking whether to enable gnomekeyring support" >&5
- echo $ECHO_N "checking whether to enable gnomekeyring support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable gnomekeyring support" >&5
+ $as_echo_n "checking whether to enable gnomekeyring support... " >&6; }
# Check whether --enable-gnomekeyring was given.
if test "${enable_gnomekeyring+set}" = set; then
enableval=$enable_gnomekeyring;
@@@ -20303,12 -20726,12 +20726,12 @@@ els
enable_gnomekeyring="no"
fi
- { echo "$as_me:$LINENO: result: $enable_gnomekeyring" >&5
- echo "${ECHO_T}$enable_gnomekeyring" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_gnomekeyring" >&5
+ $as_echo "$enable_gnomekeyring" >&6; }
# check whether to enable SVG support
- { echo "$as_me:$LINENO: checking whether to enable SVG support" >&5
- echo $ECHO_N "checking whether to enable SVG support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable SVG support" >&5
+ $as_echo_n "checking whether to enable SVG support... " >&6; }
# Check whether --enable-svg was given.
if test "${enable_svg+set}" = set; then
enableval=$enable_svg;
@@@ -20316,12 -20739,12 +20739,12 @@@ els
enable_svg="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg" >&5
- echo "${ECHO_T}$enable_svg" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg" >&5
+ $as_echo "$enable_svg" >&6; }
# check whether to enable WML support
- { echo "$as_me:$LINENO: checking whether to enable WML support" >&5
- echo $ECHO_N "checking whether to enable WML support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable WML support" >&5
+ $as_echo_n "checking whether to enable WML support... " >&6; }
# Check whether --enable-wml was given.
if test "${enable_wml+set}" = set; then
enableval=$enable_wml;
@@@ -20329,12 -20752,12 +20752,12 @@@ els
enable_wml="no"
fi
- { echo "$as_me:$LINENO: result: $enable_wml" >&5
- echo "${ECHO_T}$enable_wml" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_wml" >&5
+ $as_echo "$enable_wml" >&6; }
# check whether to enable Web Workers support
- { echo "$as_me:$LINENO: checking whether to enable Web Workers support" >&5
- echo $ECHO_N "checking whether to enable Web Workers support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable Web Workers support" >&5
+ $as_echo_n "checking whether to enable Web Workers support... " >&6; }
# Check whether --enable-web_workers was given.
if test "${enable_web_workers+set}" = set; then
enableval=$enable_web_workers;
@@@ -20342,8 -20765,8 +20765,8 @@@ els
enable_web_workers="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_web_workers" >&5
- echo "${ECHO_T}$enable_web_workers" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_web_workers" >&5
+ $as_echo "$enable_web_workers" >&6; }
# turn off svg features if --disable-svg is requested
if test "$enable_svg" = "no"; then
@@@ -20356,8 -20779,8 +20779,8 @@@
fi
# check whether to enable support for SVG animation
- { echo "$as_me:$LINENO: checking whether to enable support for SVG animation" >&5
- echo $ECHO_N "checking whether to enable support for SVG animation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for SVG animation" >&5
+ $as_echo_n "checking whether to enable support for SVG animation... " >&6; }
# Check whether --enable-svg_animation was given.
if test "${enable_svg_animation+set}" = set; then
enableval=$enable_svg_animation;
@@@ -20365,12 -20788,12 +20788,12 @@@ els
enable_svg_animation="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_animation" >&5
- echo "${ECHO_T}$enable_svg_animation" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_animation" >&5
+ $as_echo "$enable_svg_animation" >&6; }
# check whether to enable support for SVG filters
- { echo "$as_me:$LINENO: checking whether to enable support for SVG filters" >&5
- echo $ECHO_N "checking whether to enable support for SVG filters... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for SVG filters" >&5
+ $as_echo_n "checking whether to enable support for SVG filters... " >&6; }
# Check whether --enable-svg_filters was given.
if test "${enable_svg_filters+set}" = set; then
enableval=$enable_svg_filters;
@@@ -20378,12 -20801,12 +20801,12 @@@ els
enable_svg_filters="no"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_filters" >&5
- echo "${ECHO_T}$enable_svg_filters" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_filters" >&5
+ $as_echo "$enable_svg_filters" >&6; }
# check whether to enable support for SVG fonts
- { echo "$as_me:$LINENO: checking whether to enable support for SVG fonts" >&5
- echo $ECHO_N "checking whether to enable support for SVG fonts... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for SVG fonts" >&5
+ $as_echo_n "checking whether to enable support for SVG fonts... " >&6; }
# Check whether --enable-svg_fonts was given.
if test "${enable_svg_fonts+set}" = set; then
enableval=$enable_svg_fonts;
@@@ -20391,12 -20814,12 +20814,12 @@@ els
enable_svg_fonts="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_fonts" >&5
- echo "${ECHO_T}$enable_svg_fonts" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_fonts" >&5
+ $as_echo "$enable_svg_fonts" >&6; }
# check whether to enable foreign objects support for SVG
- { echo "$as_me:$LINENO: checking whether to enable support for SVG foreign objects" >&5
- echo $ECHO_N "checking whether to enable support for SVG foreign objects... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for SVG foreign objects" >&5
+ $as_echo_n "checking whether to enable support for SVG foreign objects... " >&6; }
# Check whether --enable-svg_foreign_object was given.
if test "${enable_svg_foreign_object+set}" = set; then
enableval=$enable_svg_foreign_object;
@@@ -20404,12 -20827,12 +20827,12 @@@ els
enable_svg_foreign_object="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_foreign_object" >&5
- echo "${ECHO_T}$enable_svg_foreign_object" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_foreign_object" >&5
+ $as_echo "$enable_svg_foreign_object" >&6; }
# check whether to enable SVG As Image support
- { echo "$as_me:$LINENO: checking whether to enable SVG as Image support" >&5
- echo $ECHO_N "checking whether to enable SVG as Image support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable SVG as Image support" >&5
+ $as_echo_n "checking whether to enable SVG as Image support... " >&6; }
# Check whether --enable-svg_as_image was given.
if test "${enable_svg_as_image+set}" = set; then
enableval=$enable_svg_as_image;
@@@ -20417,12 -20840,12 +20840,12 @@@ els
enable_svg_as_image="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_as_image" >&5
- echo "${ECHO_T}$enable_svg_as_image" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_as_image" >&5
+ $as_echo "$enable_svg_as_image" >&6; }
# check whether to enable SVG USE element support
- { echo "$as_me:$LINENO: checking whether to enable support for SVG use element" >&5
- echo $ECHO_N "checking whether to enable support for SVG use element... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable support for SVG use element" >&5
+ $as_echo_n "checking whether to enable support for SVG use element... " >&6; }
# Check whether --enable-svg_use_element was given.
if test "${enable_svg_use_element+set}" = set; then
enableval=$enable_svg_use_element;
@@@ -20430,8 -20853,8 +20853,8 @@@ els
enable_svg_use_element="yes"
fi
- { echo "$as_me:$LINENO: result: $enable_svg_use_element" >&5
- echo "${ECHO_T}$enable_svg_use_element" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_svg_use_element" >&5
+ $as_echo "$enable_svg_use_element" >&6; }
# check for SVG features, enabling SVG if necessary
if test "$enable_svg_animation" = "yes" || \
@@@ -20442,15 -20865,15 +20865,15 @@@
test "$enable_svg_use_element" = "yes"; then
svg_flags=yes
if test "$enable_svg" = "no"; then
- { echo "$as_me:$LINENO: WARNING: SVG feature(s) requested but SVG is disabled.. Enabling SVG support" >&5
- echo "$as_me: WARNING: SVG feature(s) requested but SVG is disabled.. Enabling SVG support" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: SVG feature(s) requested but SVG is disabled.. Enabling SVG support" >&5
+ $as_echo "$as_me: WARNING: SVG feature(s) requested but SVG is disabled.. Enabling SVG support" >&2;}
enable_svg=yes
fi
fi
# check whether to enable code coverage
- { echo "$as_me:$LINENO: checking whether to enable code coverage support" >&5
- echo $ECHO_N "checking whether to enable code coverage support... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable code coverage support" >&5
+ $as_echo_n "checking whether to enable code coverage support... " >&6; }
# Check whether --enable-coverage was given.
if test "${enable_coverage+set}" = set; then
enableval=$enable_coverage;
@@@ -20458,12 -20881,12 +20881,12 @@@ els
enable_coverage="no"
fi
- { echo "$as_me:$LINENO: result: $enable_coverage" >&5
- echo "${ECHO_T}$enable_coverage" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_coverage" >&5
+ $as_echo "$enable_coverage" >&6; }
# check whether to enable FastMalloc
- { echo "$as_me:$LINENO: checking whether to enable optimized memory allocator" >&5
- echo $ECHO_N "checking whether to enable optimized memory allocator... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable optimized memory allocator" >&5
+ $as_echo_n "checking whether to enable optimized memory allocator... " >&6; }
# Check whether --enable-fast_malloc was given.
if test "${enable_fast_malloc+set}" = set; then
enableval=$enable_fast_malloc;
@@@ -20471,11 -20894,11 +20894,11 @@@ els
if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi
fi
- { echo "$as_me:$LINENO: result: $enable_fast_malloc" >&5
- echo "${ECHO_T}$enable_fast_malloc" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_fast_malloc" >&5
+ $as_echo "$enable_fast_malloc" >&6; }
- { echo "$as_me:$LINENO: checking whether to enable JIT compilation" >&5
- echo $ECHO_N "checking whether to enable JIT compilation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable JIT compilation" >&5
+ $as_echo_n "checking whether to enable JIT compilation... " >&6; }
# Check whether --enable-jit was given.
if test "${enable_jit+set}" = set; then
enableval=$enable_jit;
@@@ -20485,7 -20908,7 +20908,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
@@@ -20511,39 -20934,23 +20934,39 @@@ 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)"
;;
esac
fi
- { echo "$as_me:$LINENO: result: $enable_jit" >&5
- echo "${ECHO_T}$enable_jit" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_jit" >&5
+ $as_echo "$enable_jit" >&6; }
# determine the font backend
- { echo "$as_me:$LINENO: checking the font backend to use" >&5
- echo $ECHO_N "checking the font backend to use... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking the font backend to use" >&5
+ $as_echo_n "checking the font backend to use... " >&6; }
# Check whether --with-font_backend was given.
if test "${with_font_backend+set}" = set; then
@@@ -20555,12 -20962,12 +20978,12 @@@ f
case "$with_font_backend" in
freetype|pango) ;;
- *) { { echo "$as_me:$LINENO: error: Invalid font backend: must be freetype or pango." >&5
- echo "$as_me: error: Invalid font backend: must be freetype or pango." >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: Invalid font backend: must be freetype or pango." >&5
+ $as_echo "$as_me: error: Invalid font backend: must be freetype or pango." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
- { echo "$as_me:$LINENO: result: $with_font_backend" >&5
- echo "${ECHO_T}$with_font_backend" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $with_font_backend" >&5
+ $as_echo "$with_font_backend" >&6; }
# Add '-g' flag to gcc if it's debug build
if test "$enable_debug" = "yes"; then
@@@ -20585,18 -20992,18 +21008,18 @@@ f
pkg_failed=no
- { echo "$as_me:$LINENO: checking for LIBSOUP" >&5
- echo $ECHO_N "checking for LIBSOUP... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -20611,10 -21018,10 +21034,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -20642,7 -21049,7 +21065,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION) were not met:
$LIBSOUP_PKG_ERRORS
@@@ -20653,7 -21060,7 +21076,7 @@@ Alternatively, you may set the environm
and LIBSOUP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION) were not met:
$LIBSOUP_PKG_ERRORS
@@@ -20666,7 -21073,9 +21089,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -20676,7 -21085,7 +21101,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -20686,12 -21095,12 +21111,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -20700,18 -21109,18 +21125,18 @@@
if test "$enable_gnomekeyring" = "yes"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GNOMEKEYRING" >&5
- echo $ECHO_N "checking for GNOMEKEYRING... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GNOMEKEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -20726,10 -21135,10 +21151,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GNOMEKEYRING_LIBS="$GNOMEKEYRING_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GNOMEKEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -20757,7 -21166,7 +21182,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GNOMEKEYRING_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
$GNOMEKEYRING_PKG_ERRORS
@@@ -20768,7 -21177,7 +21193,7 @@@ Alternatively, you may set the environm
and GNOMEKEYRING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
$GNOMEKEYRING_PKG_ERRORS
@@@ -20781,7 -21190,9 +21206,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -20791,7 -21202,7 +21218,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -20801,12 -21212,12 +21228,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GNOMEKEYRING_CFLAGS=$pkg_cv_GNOMEKEYRING_CFLAGS
GNOMEKEYRING_LIBS=$pkg_cv_GNOMEKEYRING_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -20818,20 -21229,20 +21245,20 @@@ if test "$with_font_backend" = "freetyp
if test "$with_target" = "directfb"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for FREETYPE" >&5
- echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
+ { ($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
freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>/dev/null`
@@@ -20847,12 -21258,12 +21274,12 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
+ { ($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
freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>/dev/null`
@@@ -20883,7 -21294,7 +21310,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
$FREETYPE_PKG_ERRORS
@@@ -20895,7 -21306,7 +21322,7 @@@ Alternatively, you may set the environm
and FREETYPE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ $as_echo "$as_me: error: Package requirements (fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
$FREETYPE_PKG_ERRORS
@@@ -20909,7 -21320,9 +21336,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -20919,7 -21332,7 +21348,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -20929,33 -21342,33 +21358,33 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
else
pkg_failed=no
- { echo "$as_me:$LINENO: checking for FREETYPE" >&5
- echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@@ -20972,14 -21385,14 +21401,14 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@@ -21013,7 -21426,7 +21442,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (cairo-ft
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
@@@ -21026,7 -21439,7 +21455,7 @@@ Alternatively, you may set the environm
and FREETYPE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (cairo-ft
+ $as_echo "$as_me: error: Package requirements (cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
@@@ -21041,7 -21454,9 +21470,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -21051,7 -21466,7 +21482,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -21061,12 -21476,12 +21492,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
fi
@@@ -21081,18 -21496,18 +21512,18 @@@ if test "$enable_icon_database" = "yes
test "$enable_dom_storage" = "yes"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for SQLITE3" >&5
- echo $ECHO_N "checking for SQLITE3... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -21107,10 -21522,10 +21538,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -21138,7 -21553,7 +21569,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$SQLITE3_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (sqlite3 >= $SQLITE_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (sqlite3 >= $SQLITE_REQUIRED_VERSION) were not met:
$SQLITE3_PKG_ERRORS
@@@ -21149,7 -21564,7 +21580,7 @@@ Alternatively, you may set the environm
and SQLITE3_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (sqlite3 >= $SQLITE_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (sqlite3 >= $SQLITE_REQUIRED_VERSION) were not met:
$SQLITE3_PKG_ERRORS
@@@ -21162,7 -21577,9 +21593,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -21172,7 -21589,7 +21605,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -21182,12 -21599,12 +21615,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -21198,18 -21615,18 +21631,18 @@@ f
if test "$enable_xslt" = "yes"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for LIBXSLT" >&5
- echo $ECHO_N "checking for LIBXSLT... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -21224,10 -21641,10 +21657,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\"") >&5
+ { ($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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>/dev/null`
else
@@@ -21255,7 -21672,7 +21688,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBXSLT_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (libxslt >= $LIBXSLT_REQUIRED_VERSION) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libxslt >= $LIBXSLT_REQUIRED_VERSION) were not met:
$LIBXSLT_PKG_ERRORS
@@@ -21266,7 -21683,7 +21699,7 @@@ Alternatively, you may set the environm
and LIBXSLT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (libxslt >= $LIBXSLT_REQUIRED_VERSION) were not met:
+ $as_echo "$as_me: error: Package requirements (libxslt >= $LIBXSLT_REQUIRED_VERSION) were not met:
$LIBXSLT_PKG_ERRORS
@@@ -21279,7 -21696,9 +21712,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -21289,7 -21708,7 +21724,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -21299,12 -21718,12 +21734,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
LIBXSLT_CFLAGS=$pkg_cv_LIBXSLT_CFLAGS
LIBXSLT_LIBS=$pkg_cv_LIBXSLT_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -21315,18 -21734,18 +21750,18 @@@ f
if test "$enable_geolocation" = "yes"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GEOCLUE" >&5
- echo $ECHO_N "checking for GEOCLUE... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GEOCLUE_CFLAGS=`$PKG_CONFIG --cflags "geoclue" 2>/dev/null`
else
@@@ -21341,10 -21760,10 +21776,10 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"geoclue\"") >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GEOCLUE_LIBS=`$PKG_CONFIG --libs "geoclue" 2>/dev/null`
else
@@@ -21372,7 -21791,7 +21807,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GEOCLUE_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (geoclue) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (geoclue) were not met:
$GEOCLUE_PKG_ERRORS
@@@ -21383,7 -21802,7 +21818,7 @@@ Alternatively, you may set the environm
and GEOCLUE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (geoclue) were not met:
+ $as_echo "$as_me: error: Package requirements (geoclue) were not met:
$GEOCLUE_PKG_ERRORS
@@@ -21396,7 -21815,9 +21831,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -21406,7 -21827,7 +21843,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -21416,12 -21837,12 +21853,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GEOCLUE_CFLAGS=$pkg_cv_GEOCLUE_CFLAGS
GEOCLUE_LIBS=$pkg_cv_GEOCLUE_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -21432,22 -21853,22 +21869,22 @@@ f
if test "$enable_video" = "yes"; then
pkg_failed=no
- { echo "$as_me:$LINENO: checking for GSTREAMER" >&5
- echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6; }
+ { $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" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
+ { ($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
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
@@@ -21464,14 -21885,14 +21901,14 @@@ if test -n "$PKG_CONFIG"; the
pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
+ { ($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
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
@@@ -21505,7 -21926,7 +21942,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10) were not met:
@@@ -21518,7 -21939,7 +21955,7 @@@ Alternatively, you may set the environm
and GSTREAMER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
- echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ $as_echo "$as_me: error: Package requirements (gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-base-0.10,
gstreamer-plugins-base-0.10) were not met:
@@@ -21533,7 -21954,9 +21970,9 @@@ See the pkg-config man page for more de
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { $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.
@@@ -21543,7 -21966,7 +21982,7 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ $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.
@@@ -21553,12 -21976,12 +21992,12 @@@ See the pkg-config man page for more de
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
:
fi
@@@ -21578,6 -22001,110 +22017,110 @@@ if test "$enable_video" = "yes"; the
html_flags=yes
fi
+
+
+ # Check whether --with-html-dir was given.
+ if test "${with_html_dir+set}" = set; then
+ withval=$with_html_dir;
+ else
+ with_html_dir='${datadir}/gtk-doc/html'
+ fi
+
+ HTML_DIR="$with_html_dir"
+
+
+ # Check whether --enable-gtk-doc was given.
+ if test "${enable_gtk_doc+set}" = set; then
+ enableval=$enable_gtk_doc;
+ else
+ enable_gtk_doc=no
+ fi
+
+
+ if test x$enable_gtk_doc = xyes; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.10") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ :
+ else
+ { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.10 installed to build gtk-doc" >&5
+ $as_echo "$as_me: error: You need to have gtk-doc >= 1.10 installed to build gtk-doc" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+ $as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+ $as_echo "$enable_gtk_doc" >&6; }
+
+ for ac_prog in gtkdoc-check
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ ;;
+ esac
+ fi
+ GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+ if test -n "$GTKDOC_CHECK"; then
+ { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+ $as_echo "$GTKDOC_CHECK" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ test -n "$GTKDOC_CHECK" && break
+ done
+
+
+ if test x$enable_gtk_doc = xyes; then
+ ENABLE_GTK_DOC_TRUE=
+ ENABLE_GTK_DOC_FALSE='#'
+ else
+ ENABLE_GTK_DOC_TRUE='#'
+ ENABLE_GTK_DOC_FALSE=
+ fi
+
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
+ else
+ GTK_DOC_USE_LIBTOOL_TRUE='#'
+ GTK_DOC_USE_LIBTOOL_FALSE=
+ fi
+
+
+
# OS conditionals
if test "$os_win32" = "yes"; then
OS_WIN32_TRUE=
@@@ -21884,7 -22411,7 +22427,7 @@@ els
fi
- ac_config_files="$ac_config_files GNUmakefile WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in WebKit/gtk/webkit/webkitversion.h"
+ ac_config_files="$ac_config_files GNUmakefile WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in WebKit/gtk/webkit/webkitversion.h WebKit/gtk/docs/GNUmakefile WebKit/gtk/docs/version.xml"
cat >confcache <<\_ACEOF
@@@ -21914,11 -22441,12 +22457,12 @@@ _ACEO
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@@ -21951,12 -22479,12 +22495,12 @@@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
- echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
- echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@@ -21972,7 -22500,7 +22516,7 @@@ ac_ltlibobjs
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@@ -21984,306 -22512,321 +22528,321 @@@ LTLIBOBJS=$ac_ltlibobj
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ $as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ $as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+ $as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
+ $as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"OS_UNIX\" was never defined.
+ $as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"OS_LINUX\" was never defined.
+ $as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${OS_GNU_TRUE}" && test -z "${OS_GNU_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"OS_GNU\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_GNU\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"OS_GNU\" was never defined.
+ $as_echo "$as_me: error: conditional \"OS_GNU\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${OS_FREEBSD_TRUE}" && test -z "${OS_FREEBSD_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"OS_FREEBSD\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"OS_FREEBSD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"OS_FREEBSD\" was never defined.
+ $as_echo "$as_me: error: conditional \"OS_FREEBSD\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${TARGET_X11_TRUE}" && test -z "${TARGET_X11_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TARGET_X11\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TARGET_X11\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"TARGET_X11\" was never defined.
+ $as_echo "$as_me: error: conditional \"TARGET_X11\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${TARGET_WIN32_TRUE}" && test -z "${TARGET_WIN32_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TARGET_WIN32\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TARGET_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"TARGET_WIN32\" was never defined.
+ $as_echo "$as_me: error: conditional \"TARGET_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${TARGET_QUARTZ_TRUE}" && test -z "${TARGET_QUARTZ_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TARGET_QUARTZ\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TARGET_QUARTZ\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"TARGET_QUARTZ\" was never defined.
+ $as_echo "$as_me: error: conditional \"TARGET_QUARTZ\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${TARGET_DIRECTFB_TRUE}" && test -z "${TARGET_DIRECTFB_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TARGET_DIRECTFB\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TARGET_DIRECTFB\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"TARGET_DIRECTFB\" was never defined.
+ $as_echo "$as_me: error: conditional \"TARGET_DIRECTFB\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USE_GNOMEKEYRING_TRUE}" && test -z "${USE_GNOMEKEYRING_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_GNOMEKEYRING\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GNOMEKEYRING\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"USE_GNOMEKEYRING\" was never defined.
+ $as_echo "$as_me: error: conditional \"USE_GNOMEKEYRING\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USE_FREETYPE_TRUE}" && test -z "${USE_FREETYPE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_FREETYPE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"USE_FREETYPE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"USE_FREETYPE\" was never defined.
+ $as_echo "$as_me: error: conditional \"USE_FREETYPE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USE_PANGO_TRUE}" && test -z "${USE_PANGO_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_PANGO\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"USE_PANGO\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"USE_PANGO\" was never defined.
+ $as_echo "$as_me: error: conditional \"USE_PANGO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DEBUG\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_DEBUG\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DASHBOARD_SUPPORT_TRUE}" && test -z "${ENABLE_DASHBOARD_SUPPORT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DASHBOARD_SUPPORT\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DASHBOARD_SUPPORT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_DASHBOARD_SUPPORT\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_DASHBOARD_SUPPORT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_3D_TRANSFORMS_TRUE}" && test -z "${ENABLE_3D_TRANSFORMS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_3D_TRANSFORMS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_3D_TRANSFORMS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_3D_TRANSFORMS\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_3D_TRANSFORMS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_CHANNEL_MESSAGING_TRUE}" && test -z "${ENABLE_CHANNEL_MESSAGING_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_CHANNEL_MESSAGING\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_CHANNEL_MESSAGING\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_CHANNEL_MESSAGING\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_CHANNEL_MESSAGING\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_OFFLINE_WEB_APPLICATIONS_TRUE}" && test -z "${ENABLE_OFFLINE_WEB_APPLICATIONS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_OFFLINE_WEB_APPLICATIONS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_OFFLINE_WEB_APPLICATIONS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_OFFLINE_WEB_APPLICATIONS\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_OFFLINE_WEB_APPLICATIONS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DOM_STORAGE_TRUE}" && test -z "${ENABLE_DOM_STORAGE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOM_STORAGE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOM_STORAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_DOM_STORAGE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_DOM_STORAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_DATABASE_TRUE}" && test -z "${ENABLE_DATABASE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DATABASE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DATABASE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_DATABASE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_DATABASE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_ICONDATABASE_TRUE}" && test -z "${ENABLE_ICONDATABASE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_ICONDATABASE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_ICONDATABASE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_ICONDATABASE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_ICONDATABASE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_XPATH_TRUE}" && test -z "${ENABLE_XPATH_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_XPATH\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_XPATH\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_XPATH\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_XPATH\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_XSLT_TRUE}" && test -z "${ENABLE_XSLT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_XSLT\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_XSLT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_XSLT\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_XSLT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_GEOLOCATION_TRUE}" && test -z "${ENABLE_GEOLOCATION_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GEOLOCATION\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GEOLOCATION\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_GEOLOCATION\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_GEOLOCATION\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_VIDEO_TRUE}" && test -z "${ENABLE_VIDEO_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_VIDEO\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_VIDEO\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_VIDEO\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_VIDEO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_TRUE}" && test -z "${ENABLE_SVG_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_ANIMATION_TRUE}" && test -z "${ENABLE_SVG_ANIMATION_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_ANIMATION\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_ANIMATION\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_ANIMATION\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_ANIMATION\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_FILTERS_TRUE}" && test -z "${ENABLE_SVG_FILTERS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FILTERS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FILTERS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_FILTERS\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_FILTERS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_FONTS_TRUE}" && test -z "${ENABLE_SVG_FONTS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FONTS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FONTS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_FONTS\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_FONTS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_FOREIGN_OBJECT_TRUE}" && test -z "${ENABLE_SVG_FOREIGN_OBJECT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FOREIGN_OBJECT\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_FOREIGN_OBJECT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_FOREIGN_OBJECT\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_FOREIGN_OBJECT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_AS_IMAGE_TRUE}" && test -z "${ENABLE_SVG_AS_IMAGE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_AS_IMAGE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_AS_IMAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_AS_IMAGE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_AS_IMAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_SVG_USE_TRUE}" && test -z "${ENABLE_SVG_USE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_USE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SVG_USE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_SVG_USE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_SVG_USE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_FAST_MALLOC_TRUE}" && test -z "${ENABLE_FAST_MALLOC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_FAST_MALLOC\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_FAST_MALLOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_FAST_MALLOC\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_FAST_MALLOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_WML_TRUE}" && test -z "${ENABLE_WML_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_WML\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_WML\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_WML\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_WML\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_WORKERS_TRUE}" && test -z "${ENABLE_WORKERS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_WORKERS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_WORKERS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_WORKERS\" was never defined.
+ $as_echo "$as_me: error: conditional \"ENABLE_WORKERS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${SVG_FLAGS_TRUE}" && test -z "${SVG_FLAGS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"SVG_FLAGS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"SVG_FLAGS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"SVG_FLAGS\" was never defined.
+ $as_echo "$as_me: error: conditional \"SVG_FLAGS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HTML_FLAGS_TRUE}" && test -z "${HTML_FLAGS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HTML_FLAGS\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HTML_FLAGS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"HTML_FLAGS\" was never defined.
+ $as_echo "$as_me: error: conditional \"HTML_FLAGS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
+ { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@@ -22296,7 -22839,7 +22855,7 @@@ ac_cs_silent=fals
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@@ -22306,7 -22849,7 +22865,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@@ -22328,17 -22871,45 +22887,45 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+ as_nl='
+ '
+ export as_nl
+ # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+ else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+ fi
+
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@@ -22354,8 -22925,6 +22941,6 @@@ f
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
- as_nl='
- '
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@@ -22378,7 -22947,7 +22963,7 @@@ if test "x$as_myself" = x; the
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@@ -22391,17 -22960,10 +22976,10 @@@ PS2='>
PS4='+ '
# NLS nuisances.
- for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
- do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
+ LC_ALL=C
+ export LC_ALL
+ LANGUAGE=C
+ export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -22423,7 -22985,7 +23001,7 @@@ as_me=`$as_basename -- "$0" |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
+ $as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@@ -22474,7 -23036,7 +23052,7 @@@ $as_unset CDPAT
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@@ -22502,7 -23064,6 +23080,6 @@@ case `echo -n x` i
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@@ -22515,19 -23076,22 +23092,22 @@@ if test -d conf$$.dir; the
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
- fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+ fi
+ if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@@ -22552,10 -23116,10 +23132,10 @@@ els
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@@ -22577,8 -23141,8 +23157,8 @@@ 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.4, which was
- generated by GNU Autoconf 2.61. Invocation command line was
+ This file was extended by WebKit $as_me 1.1.5, which was
+ generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@@ -22591,7 -23155,16 +23171,16 @@@ on `(hostname || uname -n) 2>/dev/null
_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ case $ac_config_files in *"
+ "*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
+
+ case $ac_config_headers in *"
+ "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+ esac
+
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
@@@ -22599,22 -23172,23 +23188,23 @@@ config_commands="$ac_config_commands
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
- Usage: $0 [OPTIONS] [FILE]...
+ Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@@ -22628,13 -23202,13 +23218,13 @@@ $config_command
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- WebKit config.status 1.1.4
- configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ WebKit config.status 1.1.5
+ configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@@ -22642,11 -23216,12 +23232,12 @@@ ac_pwd='$ac_pwd
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
+ AWK='$AWK'
+ test -n "\$AWK" || AWK=awk
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- # If no file are specified by the user, then we need to provide default
- # value. By we need to know if files were specified by the user.
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@@ -22668,30 -23243,36 +23259,36 @@@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
+ { $as_echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };;
--help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@@ -22710,27 -23291,29 +23307,29 @@@ if $ac_cs_silent; the
fi
_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@@ -23090,7 -23673,7 +23689,7 @@@ f
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@@ -23102,9 -23685,11 +23701,11 @@@ d
"GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
"WebKit/gtk/webkit-1.0.pc") CONFIG_FILES="$CONFIG_FILES WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in" ;;
"WebKit/gtk/webkit/webkitversion.h") CONFIG_FILES="$CONFIG_FILES WebKit/gtk/webkit/webkitversion.h" ;;
+ "WebKit/gtk/docs/GNUmakefile") CONFIG_FILES="$CONFIG_FILES WebKit/gtk/docs/GNUmakefile" ;;
+ "WebKit/gtk/docs/version.xml") CONFIG_FILES="$CONFIG_FILES WebKit/gtk/docs/version.xml" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@@ -23145,393 -23730,144 +23746,144 @@@ $debug |
(umask 077 && mkdir "$tmp")
} ||
{
- echo "$me: cannot create a temporary directory in ." >&2
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
- #
- # Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+ # This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
- _ACEOF
-
-
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
- SHELL!$SHELL$ac_delim
- PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
- PACKAGE_NAME!$PACKAGE_NAME$ac_delim
- PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
- PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
- PACKAGE_STRING!$PACKAGE_STRING$ac_delim
- PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
- exec_prefix!$exec_prefix$ac_delim
- prefix!$prefix$ac_delim
- program_transform_name!$program_transform_name$ac_delim
- bindir!$bindir$ac_delim
- sbindir!$sbindir$ac_delim
- libexecdir!$libexecdir$ac_delim
- datarootdir!$datarootdir$ac_delim
- datadir!$datadir$ac_delim
- sysconfdir!$sysconfdir$ac_delim
- sharedstatedir!$sharedstatedir$ac_delim
- localstatedir!$localstatedir$ac_delim
- includedir!$includedir$ac_delim
- oldincludedir!$oldincludedir$ac_delim
- docdir!$docdir$ac_delim
- infodir!$infodir$ac_delim
- htmldir!$htmldir$ac_delim
- dvidir!$dvidir$ac_delim
- pdfdir!$pdfdir$ac_delim
- psdir!$psdir$ac_delim
- libdir!$libdir$ac_delim
- localedir!$localedir$ac_delim
- mandir!$mandir$ac_delim
- DEFS!$DEFS$ac_delim
- ECHO_C!$ECHO_C$ac_delim
- ECHO_N!$ECHO_N$ac_delim
- ECHO_T!$ECHO_T$ac_delim
- LIBS!$LIBS$ac_delim
- build_alias!$build_alias$ac_delim
- host_alias!$host_alias$ac_delim
- target_alias!$target_alias$ac_delim
- ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
- build!$build$ac_delim
- build_cpu!$build_cpu$ac_delim
- build_vendor!$build_vendor$ac_delim
- build_os!$build_os$ac_delim
- host!$host$ac_delim
- host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
- target!$target$ac_delim
- target_cpu!$target_cpu$ac_delim
- target_vendor!$target_vendor$ac_delim
- target_os!$target_os$ac_delim
- WEBKIT_MAJOR_VERSION!$WEBKIT_MAJOR_VERSION$ac_delim
- WEBKIT_MINOR_VERSION!$WEBKIT_MINOR_VERSION$ac_delim
- WEBKIT_MICRO_VERSION!$WEBKIT_MICRO_VERSION$ac_delim
- LIBWEBKITGTK_VERSION!$LIBWEBKITGTK_VERSION$ac_delim
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
- am__isrc!$am__isrc$ac_delim
- CYGPATH_W!$CYGPATH_W$ac_delim
- PACKAGE!$PACKAGE$ac_delim
- VERSION!$VERSION$ac_delim
- ACLOCAL!$ACLOCAL$ac_delim
- AUTOCONF!$AUTOCONF$ac_delim
- AUTOMAKE!$AUTOMAKE$ac_delim
- AUTOHEADER!$AUTOHEADER$ac_delim
- MAKEINFO!$MAKEINFO$ac_delim
- install_sh!$install_sh$ac_delim
- STRIP!$STRIP$ac_delim
- INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
- mkdir_p!$mkdir_p$ac_delim
- AWK!$AWK$ac_delim
- SET_MAKE!$SET_MAKE$ac_delim
- am__leading_dot!$am__leading_dot$ac_delim
- AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
- CPPFLAGS!$CPPFLAGS$ac_delim
- ac_ct_CC!$ac_ct_CC$ac_delim
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
- DEPDIR!$DEPDIR$ac_delim
- am__include!$am__include$ac_delim
- am__quote!$am__quote$ac_delim
- AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- AMDEP_FALSE!$AMDEP_FALSE$ac_delim
- AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
- CCDEPMODE!$CCDEPMODE$ac_delim
- am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
- am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
- SYMBOL_VISIBILITY!$SYMBOL_VISIBILITY$ac_delim
- SYMBOL_VISIBILITY_INLINES!$SYMBOL_VISIBILITY_INLINES$ac_delim
- PKG_CONFIG!$PKG_CONFIG$ac_delim
- PERL!$PERL$ac_delim
- BISON!$BISON$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
-
- ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
+ ac_cr='
'
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+ else
+ ac_cs_awk_cr=$ac_cr
fi
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- _ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
- s/^/s,@/; s/!/@,|#_!!_#|/
- :n
- t n
- s/'"$ac_delim"'$/,g/; t
- s/$/\\/; p
- N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
- CEOF$ac_eof
+ echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
+ {
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
- MV!$MV$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
- CXXDEPMODE!$CXXDEPMODE$ac_delim
- am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
- am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
- CPP!$CPP$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- AS!$AS$ac_delim
- DLLTOOL!$DLLTOOL$ac_delim
- OBJDUMP!$OBJDUMP$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
- SED!$SED$ac_delim
- FGREP!$FGREP$ac_delim
- LD!$LD$ac_delim
- DUMPBIN!$DUMPBIN$ac_delim
- ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
- NM!$NM$ac_delim
- LN_S!$LN_S$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
- lt_ECHO!$lt_ECHO$ac_delim
- DSYMUTIL!$DSYMUTIL$ac_delim
- NMEDIT!$NMEDIT$ac_delim
- LIPO!$LIPO$ac_delim
- OTOOL!$OTOOL$ac_delim
- OTOOL64!$OTOOL64$ac_delim
- CXXCPP!$CXXCPP$ac_delim
- DOLT_BASH!$DOLT_BASH$ac_delim
- LTCOMPILE!$LTCOMPILE$ac_delim
- LTCXXCOMPILE!$LTCXXCOMPILE$ac_delim
- FLEX!$FLEX$ac_delim
- GPERF!$GPERF$ac_delim
- JPEG_LIBS!$JPEG_LIBS$ac_delim
- PNG_LIBS!$PNG_LIBS$ac_delim
- HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
- HILDON_LIBS!$HILDON_LIBS$ac_delim
- HILDON_CPPFLAGS!$HILDON_CPPFLAGS$ac_delim
- GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
- GLIB_LIBS!$GLIB_LIBS$ac_delim
- GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
- GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
- icu_config!$icu_config$ac_delim
- UNICODE_CFLAGS!$UNICODE_CFLAGS$ac_delim
- UNICODE_LIBS!$UNICODE_LIBS$ac_delim
- LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
- LIBXML_LIBS!$LIBXML_LIBS$ac_delim
- PANGO_CFLAGS!$PANGO_CFLAGS$ac_delim
- PANGO_LIBS!$PANGO_LIBS$ac_delim
- CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
- CAIRO_LIBS!$CAIRO_LIBS$ac_delim
- GTK_CFLAGS!$GTK_CFLAGS$ac_delim
- GTK_LIBS!$GTK_LIBS$ac_delim
- XT_CFLAGS!$XT_CFLAGS$ac_delim
- XT_LIBS!$XT_LIBS$ac_delim
- LIBSOUP_CFLAGS!$LIBSOUP_CFLAGS$ac_delim
- LIBSOUP_LIBS!$LIBSOUP_LIBS$ac_delim
- GNOMEKEYRING_CFLAGS!$GNOMEKEYRING_CFLAGS$ac_delim
- GNOMEKEYRING_LIBS!$GNOMEKEYRING_LIBS$ac_delim
- FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
- FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
- SQLITE3_CFLAGS!$SQLITE3_CFLAGS$ac_delim
- SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
- LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
- LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
- GEOCLUE_CFLAGS!$GEOCLUE_CFLAGS$ac_delim
- GEOCLUE_LIBS!$GEOCLUE_LIBS$ac_delim
- GSTREAMER_CFLAGS!$GSTREAMER_CFLAGS$ac_delim
- GSTREAMER_LIBS!$GSTREAMER_LIBS$ac_delim
- COVERAGE_CFLAGS!$COVERAGE_CFLAGS$ac_delim
- COVERAGE_LDFLAGS!$COVERAGE_LDFLAGS$ac_delim
- OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim
- OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim
- OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim
- OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim
- OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim
- OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim
- OS_GNU_TRUE!$OS_GNU_TRUE$ac_delim
- OS_GNU_FALSE!$OS_GNU_FALSE$ac_delim
- OS_FREEBSD_TRUE!$OS_FREEBSD_TRUE$ac_delim
- OS_FREEBSD_FALSE!$OS_FREEBSD_FALSE$ac_delim
- TARGET_X11_TRUE!$TARGET_X11_TRUE$ac_delim
- TARGET_X11_FALSE!$TARGET_X11_FALSE$ac_delim
- TARGET_WIN32_TRUE!$TARGET_WIN32_TRUE$ac_delim
- TARGET_WIN32_FALSE!$TARGET_WIN32_FALSE$ac_delim
- TARGET_QUARTZ_TRUE!$TARGET_QUARTZ_TRUE$ac_delim
- TARGET_QUARTZ_FALSE!$TARGET_QUARTZ_FALSE$ac_delim
- TARGET_DIRECTFB_TRUE!$TARGET_DIRECTFB_TRUE$ac_delim
- TARGET_DIRECTFB_FALSE!$TARGET_DIRECTFB_FALSE$ac_delim
- USE_GNOMEKEYRING_TRUE!$USE_GNOMEKEYRING_TRUE$ac_delim
- USE_GNOMEKEYRING_FALSE!$USE_GNOMEKEYRING_FALSE$ac_delim
- USE_FREETYPE_TRUE!$USE_FREETYPE_TRUE$ac_delim
- USE_FREETYPE_FALSE!$USE_FREETYPE_FALSE$ac_delim
- USE_PANGO_TRUE!$USE_PANGO_TRUE$ac_delim
- USE_PANGO_FALSE!$USE_PANGO_FALSE$ac_delim
- _ACEOF
+ . ./conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+ rm -f conf$$subs.sh
- ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
- fi
-
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- _ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
- s/^/s,@/; s/!/@,|#_!!_#|/
- :n
- t n
- s/'"$ac_delim"'$/,g/; t
- s/$/\\/; p
- N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
- CEOF$ac_eof
- _ACEOF
-
-
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
- ENABLE_DEBUG_TRUE!$ENABLE_DEBUG_TRUE$ac_delim
- ENABLE_DEBUG_FALSE!$ENABLE_DEBUG_FALSE$ac_delim
- ENABLE_DASHBOARD_SUPPORT_TRUE!$ENABLE_DASHBOARD_SUPPORT_TRUE$ac_delim
- ENABLE_DASHBOARD_SUPPORT_FALSE!$ENABLE_DASHBOARD_SUPPORT_FALSE$ac_delim
- ENABLE_3D_TRANSFORMS_TRUE!$ENABLE_3D_TRANSFORMS_TRUE$ac_delim
- ENABLE_3D_TRANSFORMS_FALSE!$ENABLE_3D_TRANSFORMS_FALSE$ac_delim
- ENABLE_CHANNEL_MESSAGING_TRUE!$ENABLE_CHANNEL_MESSAGING_TRUE$ac_delim
- ENABLE_CHANNEL_MESSAGING_FALSE!$ENABLE_CHANNEL_MESSAGING_FALSE$ac_delim
- ENABLE_OFFLINE_WEB_APPLICATIONS_TRUE!$ENABLE_OFFLINE_WEB_APPLICATIONS_TRUE$ac_delim
- ENABLE_OFFLINE_WEB_APPLICATIONS_FALSE!$ENABLE_OFFLINE_WEB_APPLICATIONS_FALSE$ac_delim
- ENABLE_DOM_STORAGE_TRUE!$ENABLE_DOM_STORAGE_TRUE$ac_delim
- ENABLE_DOM_STORAGE_FALSE!$ENABLE_DOM_STORAGE_FALSE$ac_delim
- ENABLE_DATABASE_TRUE!$ENABLE_DATABASE_TRUE$ac_delim
- ENABLE_DATABASE_FALSE!$ENABLE_DATABASE_FALSE$ac_delim
- ENABLE_ICONDATABASE_TRUE!$ENABLE_ICONDATABASE_TRUE$ac_delim
- ENABLE_ICONDATABASE_FALSE!$ENABLE_ICONDATABASE_FALSE$ac_delim
- ENABLE_XPATH_TRUE!$ENABLE_XPATH_TRUE$ac_delim
- ENABLE_XPATH_FALSE!$ENABLE_XPATH_FALSE$ac_delim
- ENABLE_XSLT_TRUE!$ENABLE_XSLT_TRUE$ac_delim
- ENABLE_XSLT_FALSE!$ENABLE_XSLT_FALSE$ac_delim
- ENABLE_GEOLOCATION_TRUE!$ENABLE_GEOLOCATION_TRUE$ac_delim
- ENABLE_GEOLOCATION_FALSE!$ENABLE_GEOLOCATION_FALSE$ac_delim
- ENABLE_VIDEO_TRUE!$ENABLE_VIDEO_TRUE$ac_delim
- ENABLE_VIDEO_FALSE!$ENABLE_VIDEO_FALSE$ac_delim
- ENABLE_SVG_TRUE!$ENABLE_SVG_TRUE$ac_delim
- ENABLE_SVG_FALSE!$ENABLE_SVG_FALSE$ac_delim
- ENABLE_SVG_ANIMATION_TRUE!$ENABLE_SVG_ANIMATION_TRUE$ac_delim
- ENABLE_SVG_ANIMATION_FALSE!$ENABLE_SVG_ANIMATION_FALSE$ac_delim
- ENABLE_SVG_FILTERS_TRUE!$ENABLE_SVG_FILTERS_TRUE$ac_delim
- ENABLE_SVG_FILTERS_FALSE!$ENABLE_SVG_FILTERS_FALSE$ac_delim
- ENABLE_SVG_FONTS_TRUE!$ENABLE_SVG_FONTS_TRUE$ac_delim
- ENABLE_SVG_FONTS_FALSE!$ENABLE_SVG_FONTS_FALSE$ac_delim
- ENABLE_SVG_FOREIGN_OBJECT_TRUE!$ENABLE_SVG_FOREIGN_OBJECT_TRUE$ac_delim
- ENABLE_SVG_FOREIGN_OBJECT_FALSE!$ENABLE_SVG_FOREIGN_OBJECT_FALSE$ac_delim
- ENABLE_SVG_AS_IMAGE_TRUE!$ENABLE_SVG_AS_IMAGE_TRUE$ac_delim
- ENABLE_SVG_AS_IMAGE_FALSE!$ENABLE_SVG_AS_IMAGE_FALSE$ac_delim
- ENABLE_SVG_USE_TRUE!$ENABLE_SVG_USE_TRUE$ac_delim
- ENABLE_SVG_USE_FALSE!$ENABLE_SVG_USE_FALSE$ac_delim
- ENABLE_COVERAGE_TRUE!$ENABLE_COVERAGE_TRUE$ac_delim
- ENABLE_COVERAGE_FALSE!$ENABLE_COVERAGE_FALSE$ac_delim
- ENABLE_FAST_MALLOC_TRUE!$ENABLE_FAST_MALLOC_TRUE$ac_delim
- ENABLE_FAST_MALLOC_FALSE!$ENABLE_FAST_MALLOC_FALSE$ac_delim
- ENABLE_WML_TRUE!$ENABLE_WML_TRUE$ac_delim
- ENABLE_WML_FALSE!$ENABLE_WML_FALSE$ac_delim
- ENABLE_WORKERS_TRUE!$ENABLE_WORKERS_TRUE$ac_delim
- ENABLE_WORKERS_FALSE!$ENABLE_WORKERS_FALSE$ac_delim
- SVG_FLAGS_TRUE!$SVG_FLAGS_TRUE$ac_delim
- SVG_FLAGS_FALSE!$SVG_FLAGS_FALSE$ac_delim
- HTML_FLAGS_TRUE!$HTML_FLAGS_TRUE$ac_delim
- HTML_FLAGS_FALSE!$HTML_FLAGS_FALSE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
+ sed -n '
+ h
+ s/^/S["/; s/!.*/"]=/
+ p
+ g
+ s/^[^!]*!//
+ :repl
+ t repl
+ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+ s/\(.\{148\}\).*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+ n
+ b repl
+ :more1
+ s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+ p
+ g
+ s/.\{148\}//
+ t nl
+ :delim
+ h
+ s/\(.\{148\}\).*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+ b
+ :more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+ p
+ g
+ s/.\{148\}//
+ t delim
+ ' <conf$$subs.awk | sed '
+ /^[^""]/{
+ N
+ s/\n//
+ }
+ ' >>$CONFIG_STATUS || ac_write_fail=1
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+ cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
+ }
+ {
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
- ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
- fi
+ print line
+ }
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+ _ACAWK
_ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
- s/^/s,@/; s/!/@,|#_!!_#|/
- :n
- t n
- s/'"$ac_delim"'$/,g/; t
- s/$/\\/; p
- N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
- :end
- s/|#_!!_#|//g
- CEOF$ac_eof
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+ cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+ $as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
_ACEOF
-
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@@ -23547,19 -23883,133 +23899,133 @@@ s/^[^=]*=[ ]*$/
}'
fi
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
+ # Set up the scripts for CONFIG_HEADERS section.
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+ cat >"$tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+ # Transform confdefs.h into an awk script `defines.awk', embedded as
+ # here-document in config.status, that substitutes the proper values into
+ # config.h.in to produce config.h.
+
+ # Create a delimiter string that does not exist in confdefs.h, to ease
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+ done
+
+ # For the awk script, D is an array of macro values keyed by name,
+ # likewise P contains macro parameters if any. Preserve backslash
+ # newline sequences.
+
+ ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+ sed -n '
+ s/.\{148\}/&'"$ac_delim"'/g
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*/ /
+ t def
+ d
+ :def
+ s/\\$//
+ t bsnl
+ s/["\\]/\\&/g
+ s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+ D["\1"]=" \3"/p
+ s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+ d
+ :bsnl
+ s/["\\]/\\&/g
+ s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+ D["\1"]=" \3\\\\\\n"\\/p
+ t cont
+ s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+ t cont
+ d
+ :cont
+ n
+ s/.\{148\}/&'"$ac_delim"'/g
+ t clear
+ :clear
+ s/\\$//
+ t bsnlc
+ s/["\\]/\\&/g; s/^/"/; s/$/"/p
+ d
+ :bsnlc
+ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+ b cont
+ ' <confdefs.h | sed '
+ s/'"$ac_delim"'/"\\\
+ "/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+ }
+ /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+ }
+ { print }
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+ $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+ { (exit 1); exit 1; }; }
+ fi # test -n "$CONFIG_HEADERS"
+
- for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+ eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+ shift
+ for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
- echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@@ -23588,26 -24038,38 +24054,38 @@@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
- echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ $as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@@ -23617,7 -24079,7 +24095,7 @@@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
+ $as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -23643,7 -24105,7 +24121,7 @@@
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@@ -23652,7 -24114,7 +24130,7 @@@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
+ $as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -23673,17 -24135,17 +24151,17 @@@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -23728,12 -24190,13 +24206,13 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
esac
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
- case `sed -n '/datarootdir/ {
+ ac_sed_dataroot='
+ /datarootdir/ {
p
q
}
@@@ -23742,13 -24205,14 +24221,14 @@@
/@infodir@/p
/@localedir@/p
/@mandir@/p
- ' $ac_file_inputs` in
+ '
+ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
- echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@@ -23762,15 -24226,16 +24242,16 @@@ _ACEO
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- s&@configure_input@&$configure_input&;t t
+ s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+ s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@@ -23781,121 -24246,60 +24262,60 @@@ s&@abs_top_builddir@&$ac_abs_top_buildd
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
- " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
- echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
:H)
#
# CONFIG_HEADER
#
- _ACEOF
-
- # Transform confdefs.h into a sed script `conftest.defines', that
- # substitutes the proper values into config.h.in to produce config.h.
- rm -f conftest.defines conftest.tail
- # First, append a space to every undef/define line, to ease matching.
- echo 's/$/ /' >conftest.defines
- # Then, protect against being on the right side of a sed subst, or in
- # an unquoted here document, in config.status. If some macros were
- # called several times there might be several #defines for the same
- # symbol, which is useless. But do not sort them, since the last
- # AC_DEFINE must be honored.
- ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
- # These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
- # NAME is the cpp macro being defined, VALUE is the value it is being given.
- # PARAMS is the parameter list in the macro definition--in most cases, it's
- # just an empty string.
- ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
- ac_dB='\\)[ (].*,\\1define\\2'
- ac_dC=' '
- ac_dD=' ,'
-
- uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
- # Remove the space that was appended to ease matching.
- # Then replace #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- # (The regexp can be short, since the line contains either #define or #undef.)
- echo 's/ $//
- s,^[ #]*u.*,/* & */,' >>conftest.defines
-
- # Break up conftest.defines:
- ac_max_sed_lines=50
-
- # First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
- # Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
- # Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
- # et cetera.
- ac_in='$ac_file_inputs'
- ac_out='"$tmp/out1"'
- ac_nxt='"$tmp/out2"'
-
- while :
- do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
- /^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
- /^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
- b
- :def
- _ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
- done
- rm -f conftest.defines conftest.tail
-
- echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+ $as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
fi
- rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_arg=$ac_file
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
@@@ -23910,7 -24314,7 +24330,7 @@@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$_am_arg" |
+ $as_echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -23930,14 -24334,23 +24350,23 @@@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
- echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ $as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ "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
# 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.
@@@ -23953,7 -24366,7 +24382,7 @@@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
+ $as_echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -23997,7 -24410,7 +24426,7 @@@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/]
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
+ $as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -24023,7 -24436,7 +24452,7 @@@
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@@ -24032,7 -24445,7 +24461,7 @@@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
+ $as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@@ -24053,8 -24466,8 +24482,8 @@@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
@@@ -24879,6 -25292,11 +25308,11 @@@ _ACEO
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+ test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@@ -24900,6 -25318,10 +25334,10 @@@ if test "$no_create" != yes; the
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
echo "
diff --combined configure.ac
index fb6a6c7,c9667dd..e2c9f40
--- 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], [4])
+ m4_define([webkit_micro_version], [5])
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=4:0:2
+ LIBWEBKITGTK_VERSION=5:0:3
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@@ -183,7 -183,7 +183,7 @@@ LIBXML_REQUIRED_VERSION=2.
# minimum GTK+ base dependencies
PANGO_REQUIRED_VERSION=1.0
- GTK_REQUIRED_VERSION=2.8
+ GTK_REQUIRED_VERSION=2.10
# optional modules
LIBSOUP_REQUIRED_VERSION=2.25.91
@@@ -199,7 -199,12 +199,12 @@@ GNOME_KEYRING_REQUIRED_VERSION=2.26.
#
# todo: webcore gtk
WEBKIT_CHECK_DEPENDENCIES([glib unicode])
-
+
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
+ [The gettext catalog name])
+
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
@@@ -478,21 -483,13 +483,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)"
@@@ -606,6 -603,8 +611,8 @@@ if test "$enable_video" = "yes"; the
html_flags=yes
fi
+ GTK_DOC_CHECK([1.10])
+
# OS conditionals
AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"])
@@@ -657,6 -656,8 +664,8 @@@ AC_CONFIG_FILES(
GNUmakefile
WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
WebKit/gtk/webkit/webkitversion.h
+ WebKit/gtk/docs/GNUmakefile
+ WebKit/gtk/docs/version.xml
]
)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list