1 From edb38d702dd5a058ae0702b73a43328318b94649 Mon Sep 17 00:00:00 2001
2 From: David Tardon <dtardon@redhat.com>
3 Date: Thu, 4 Jun 2015 16:09:48 +0200
4 Subject: [PATCH] update to liborcus 0.9.1
6 Includes switching to dynamic libs.
8 Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81
10 RepositoryExternal.mk | 55 +-
13 external/liborcus/0001-fix-dllexport-decls.patch | 101 ++
14 .../0001-mark-more-symbols-as-public.patch | 52 +
15 ...ese-functions-are-implemented-in-liborcus.patch | 36 +
16 ...1-workaround-a-linking-problem-on-windows.patch | 45 +
17 external/liborcus/ExternalPackage_liborcus.mk | 22 +
18 external/liborcus/ExternalProject_liborcus.mk | 4 +-
19 external/liborcus/Library_orcus-parser.mk | 55 +
20 external/liborcus/Library_orcus.mk | 104 ++
21 external/liborcus/Module_liborcus.mk | 17 +-
22 external/liborcus/UnpackedTarball_liborcus.mk | 25 +-
23 external/liborcus/liborcus_0.1.0-configure.patch | 20 -
24 external/liborcus/liborcus_0.1.0-dllimport.patch | 24 -
25 .../liborcus/liborcus_0.7.0-configure.gcc5.patch.0 | 1800 --------------------
26 external/liborcus/visibility.patch | 11 -
27 sc/source/filter/html/htmlpars.cxx | 30 +-
28 sc/source/filter/inc/orcusinterface.hxx | 10 +
29 sc/source/filter/orcus/interface.cxx | 48 +-
30 20 files changed, 572 insertions(+), 1891 deletions(-)
31 create mode 100644 external/liborcus/0001-fix-dllexport-decls.patch
32 create mode 100644 external/liborcus/0001-mark-more-symbols-as-public.patch
33 create mode 100644 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
34 create mode 100644 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
35 create mode 100644 external/liborcus/ExternalPackage_liborcus.mk
36 create mode 100644 external/liborcus/Library_orcus-parser.mk
37 create mode 100644 external/liborcus/Library_orcus.mk
38 delete mode 100644 external/liborcus/liborcus_0.1.0-configure.patch
39 delete mode 100644 external/liborcus/liborcus_0.1.0-dllimport.patch
40 delete mode 100644 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
41 delete mode 100644 external/liborcus/visibility.patch
43 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
44 index 47e4d17..726ef75 100644
45 --- a/RepositoryExternal.mk
46 +++ b/RepositoryExternal.mk
47 @@ -3209,35 +3209,78 @@ endef
49 else # !SYSTEM_LIBORCUS
53 +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
58 +define gb_LinkTarget__use_orcus
59 +$(call gb_LinkTarget_set_include,$(1),\
60 + -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
64 +$(call gb_LinkTarget_use_libraries,$(1),\
70 +define gb_LinkTarget__use_orcus-parser
71 +$(call gb_LinkTarget_set_include,$(1),\
72 + -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
76 +$(call gb_LinkTarget_use_libraries,$(1),\
84 +$(eval $(call gb_Helper_register_packages_for_install,ooo,\
88 define gb_LinkTarget__use_orcus
89 -$(call gb_LinkTarget_use_external_project,$(1),liborcus)
90 +$(call gb_LinkTarget_use_package,$(1),liborcus)
92 $(call gb_LinkTarget_set_include,$(1),\
93 -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
97 $(call gb_LinkTarget_add_libs,$(1),\
98 - $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \
99 + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.10 \
102 $(if $(SYSTEM_BOOST), \
103 - $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
104 - $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
105 + $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
106 + $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
111 define gb_LinkTarget__use_orcus-parser
112 -$(call gb_LinkTarget_use_external_project,$(1),liborcus)
113 +$(call gb_LinkTarget_use_package,$(1),liborcus)
115 $(call gb_LinkTarget_set_include,$(1),\
116 -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
120 $(call gb_LinkTarget_add_libs,$(1),\
121 - $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \
122 + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.10 \
129 endif # SYSTEM_LIBORCUS
131 else # ENABLE_ORCUS != TRUE
132 diff --git a/configure.ac b/configure.ac
133 index c7483a0..ac00539 100644
136 @@ -9012,7 +9012,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
138 AC_DEFINE(ENABLE_ORCUS)
140 - libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 >= 0.7.0])
141 + libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0])
142 if test "$with_system_orcus" != "yes"; then
143 if test "$SYSTEM_BOOST" = "TRUE"; then
144 # ===========================================================
145 diff --git a/download.lst b/download.lst
146 index 86ce10c..7b4bfe4 100644
149 @@ -118,7 +118,7 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
150 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
151 export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
152 export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
153 -export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
154 +export ORCUS_TARBALL := 18814358772ed7bb476e04b0384af082-liborcus-0.9.1.tar.gz
155 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
156 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
157 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
158 diff --git a/external/liborcus/0001-fix-dllexport-decls.patch b/external/liborcus/0001-fix-dllexport-decls.patch
160 index 0000000..75a4423
162 +++ b/external/liborcus/0001-fix-dllexport-decls.patch
164 +From 3e08d2264984b8d5227e22c7089f00f8f2e36513 Mon Sep 17 00:00:00 2001
165 +From: David Tardon <dtardon@redhat.com>
166 +Date: Tue, 2 Jun 2015 23:26:39 +0200
167 +Subject: [PATCH] fix dllexport decls
170 + include/orcus/base64.hpp | 4 ++--
171 + include/orcus/exception.hpp | 2 +-
172 + include/orcus/pstring.hpp | 6 +++---
173 + include/orcus/stream.hpp | 2 +-
174 + include/orcus/string_pool.hpp | 2 +-
175 + 5 files changed, 8 insertions(+), 8 deletions(-)
177 +diff --git a/include/orcus/base64.hpp b/include/orcus/base64.hpp
178 +index a4cf020..0f81289 100644
179 +--- a/include/orcus/base64.hpp
180 ++++ b/include/orcus/base64.hpp
181 +@@ -22,7 +22,7 @@ namespace orcus {
182 + * @param len_base64 length of encoded character sequence.
183 + * @param decoded decoded byte sequence will be put into this parameter.
185 +-ORCUS_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64, std::vector<char>& decoded);
186 ++ORCUS_PSR_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64, std::vector<char>& decoded);
189 + * Encode a sequence of bytes into base64-encoded characters.
190 +@@ -31,7 +31,7 @@ ORCUS_DLLPUBLIC void decode_from_base64(const char* p_base64, size_t len_base64,
191 + * @param encoded base64-encoded character sequence representing the input
194 +-ORCUS_DLLPUBLIC void encode_to_base64(const std::vector<char>& input, std::string& encoded);
195 ++ORCUS_PSR_DLLPUBLIC void encode_to_base64(const std::vector<char>& input, std::string& encoded);
199 +diff --git a/include/orcus/exception.hpp b/include/orcus/exception.hpp
200 +index 63729ae..ba6132c 100644
201 +--- a/include/orcus/exception.hpp
202 ++++ b/include/orcus/exception.hpp
203 +@@ -25,7 +25,7 @@ private:
204 + ::std::string m_msg;
207 +-class ORCUS_DLLPUBLIC xml_structure_error : public general_error
208 ++class ORCUS_PSR_DLLPUBLIC xml_structure_error : public general_error
211 + explicit xml_structure_error(const ::std::string& msg);
212 +diff --git a/include/orcus/pstring.hpp b/include/orcus/pstring.hpp
213 +index e38d4be..c72b78b 100644
214 +--- a/include/orcus/pstring.hpp
215 ++++ b/include/orcus/pstring.hpp
216 +@@ -71,7 +71,7 @@ public:
220 +- struct ORCUS_DLLPUBLIC hash
221 ++ struct ORCUS_PSR_DLLPUBLIC hash
223 + size_t operator() (const pstring& val) const;
225 +@@ -86,8 +86,8 @@ inline ::std::ostream& operator<< (::std::ostream& os, const pstring& str)
226 + return os << str.str();
229 +-ORCUS_DLLPUBLIC std::string operator+ (const std::string& left, const pstring& right);
230 +-ORCUS_DLLPUBLIC std::string& operator+= (std::string& left, const pstring& right);
231 ++ORCUS_PSR_DLLPUBLIC std::string operator+ (const std::string& left, const pstring& right);
232 ++ORCUS_PSR_DLLPUBLIC std::string& operator+= (std::string& left, const pstring& right);
236 +diff --git a/include/orcus/stream.hpp b/include/orcus/stream.hpp
237 +index a32f6a4..064d386 100644
238 +--- a/include/orcus/stream.hpp
239 ++++ b/include/orcus/stream.hpp
240 +@@ -20,7 +20,7 @@ namespace orcus {
241 + * @param filepath file to open
242 + * @param strm content of the file
244 +-ORCUS_DLLPUBLIC void load_file_content(const char* filepath, std::string& strm);
245 ++ORCUS_PSR_DLLPUBLIC void load_file_content(const char* filepath, std::string& strm);
249 +diff --git a/include/orcus/string_pool.hpp b/include/orcus/string_pool.hpp
250 +index e4afa4f..b895ee4 100644
251 +--- a/include/orcus/string_pool.hpp
252 ++++ b/include/orcus/string_pool.hpp
253 +@@ -21,7 +21,7 @@ namespace orcus {
255 + * Implements string hash map.
257 +-class ORCUS_DLLPUBLIC string_pool
258 ++class ORCUS_PSR_DLLPUBLIC string_pool
265 diff --git a/external/liborcus/0001-mark-more-symbols-as-public.patch b/external/liborcus/0001-mark-more-symbols-as-public.patch
267 index 0000000..ee9658e
269 +++ b/external/liborcus/0001-mark-more-symbols-as-public.patch
271 +From 718b1adfe9c327e06b1ab796c5cd9805db63c9b3 Mon Sep 17 00:00:00 2001
272 +From: David Tardon <dtardon@redhat.com>
273 +Date: Wed, 3 Jun 2015 07:46:50 +0200
274 +Subject: [PATCH] mark more symbols as public
277 + include/orcus/xml_structure_tree.hpp | 8 ++++----
278 + 1 file changed, 4 insertions(+), 4 deletions(-)
280 +diff --git a/include/orcus/xml_structure_tree.hpp b/include/orcus/xml_structure_tree.hpp
281 +index 097e56c..58cabfd 100644
282 +--- a/include/orcus/xml_structure_tree.hpp
283 ++++ b/include/orcus/xml_structure_tree.hpp
284 +@@ -31,7 +31,7 @@ class ORCUS_DLLPUBLIC xml_structure_tree
288 +- struct entity_name
289 ++ struct ORCUS_DLLPUBLIC entity_name
293 +@@ -42,7 +42,7 @@ public:
294 + bool operator< (const entity_name& r) const;
295 + bool operator== (const entity_name& r) const;
298 ++ struct ORCUS_DLLPUBLIC hash
300 + size_t operator ()(const entity_name& val) const;
302 +@@ -50,7 +50,7 @@ public:
304 + typedef std::vector<entity_name> entity_names_type;
307 ++ struct ORCUS_DLLPUBLIC element
311 +@@ -64,7 +64,7 @@ public:
313 + * This class allows client to traverse the tree.
316 ++ class ORCUS_DLLPUBLIC walker
318 + friend class xml_structure_tree;
319 + walker_impl* mp_impl;
323 diff --git a/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch b/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
325 index 0000000..c027da6
327 +++ b/external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch
329 +From 26d33d7cfd93b22e2fa13e6a3e28d133619948cf Mon Sep 17 00:00:00 2001
330 +From: David Tardon <dtardon@redhat.com>
331 +Date: Thu, 4 Jun 2015 12:33:26 +0200
332 +Subject: [PATCH] these functions are implemented in liborcus
335 + include/orcus/spreadsheet/types.hpp | 6 +++---
336 + 1 file changed, 3 insertions(+), 3 deletions(-)
338 +diff --git a/include/orcus/spreadsheet/types.hpp b/include/orcus/spreadsheet/types.hpp
339 +index a78340e..bec14c8 100644
340 +--- a/include/orcus/spreadsheet/types.hpp
341 ++++ b/include/orcus/spreadsheet/types.hpp
342 +@@ -22,8 +22,8 @@ typedef unsigned char color_elem_t;
343 + typedef unsigned short col_width_t;
344 + typedef unsigned short row_height_t;
346 +-ORCUS_SPM_DLLPUBLIC col_width_t get_default_column_width();
347 +-ORCUS_SPM_DLLPUBLIC row_height_t get_default_row_height();
348 ++ORCUS_DLLPUBLIC col_width_t get_default_column_width();
349 ++ORCUS_DLLPUBLIC row_height_t get_default_row_height();
351 + enum border_direction_t
353 +@@ -192,7 +192,7 @@ enum databar_axis_t
354 + * Convert a string representation of a totals row function name to its
355 + * equivalent enum value.
357 +-ORCUS_SPM_DLLPUBLIC totals_row_function_t to_totals_row_function_enum(const char* p, size_t n);
358 ++ORCUS_DLLPUBLIC totals_row_function_t to_totals_row_function_enum(const char* p, size_t n);
365 diff --git a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
367 index 0000000..5710877
369 +++ b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch
371 +From 71841b7aa7c5e75a793cfaafb31865524a74d9fc Mon Sep 17 00:00:00 2001
372 +From: David Tardon <dtardon@redhat.com>
373 +Date: Thu, 4 Jun 2015 16:13:18 +0200
374 +Subject: [PATCH] workaround a linking problem on windows
376 +Linking scfiltlo.dll gives the following error:
378 +xmlcontext.o : error LNK2019: unresolved external symbol "char const * const orcus::XMLNS_UNKNOWN_ID" (?XMLNS_UNKNOWN_ID@orcus@@3QBDB) referenced in function "void __cdecl std::_For_each<unsigned int const *,class `anonymous namespace'::SetNamespaceAlias>(unsigned int const *,unsigned int const *,class `anonymous namespace'::SetNamespaceAlias &)" (??$_For_each@PBIVSetNamespaceAlias@?A0xafb5dd33@@@std@@YAXPBI0AAVSetNamespaceAlias@?A0xafb5dd33@@@Z)
379 +C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/instdir/program/scfiltlo.dll : fatal error LNK1120: 1 unresolved externals
381 +I have got no idea what is the cause of this: the constant--exported in
382 +liborcus-parser.dll--is used in liborus.dll without any problem.
384 + include/orcus/types.hpp | 2 +-
385 + src/parser/types.cpp | 1 -
386 + 2 files changed, 1 insertion(+), 2 deletions(-)
388 +diff --git a/include/orcus/types.hpp b/include/orcus/types.hpp
389 +index b6e3f83..8027f25 100644
390 +--- a/include/orcus/types.hpp
391 ++++ b/include/orcus/types.hpp
392 +@@ -21,7 +21,7 @@ namespace orcus {
393 + typedef size_t xml_token_t;
394 + typedef const char* xmlns_id_t;
396 +-ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID;
397 ++const xmlns_id_t XMLNS_UNKNOWN_ID = NULL;
398 + ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN;
399 + ORCUS_PSR_DLLPUBLIC extern const size_t index_not_found;
400 + ORCUS_PSR_DLLPUBLIC extern const size_t unspecified;
401 +diff --git a/src/parser/types.cpp b/src/parser/types.cpp
402 +index be4e304..0a1b4a7 100644
403 +--- a/src/parser/types.cpp
404 ++++ b/src/parser/types.cpp
409 +-const xmlns_id_t XMLNS_UNKNOWN_ID = NULL;
410 + const xml_token_t XML_UNKNOWN_TOKEN = 0;
412 + const size_t index_not_found = std::numeric_limits<size_t>::max();
416 diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
418 index 0000000..96899e7
420 +++ b/external/liborcus/ExternalPackage_liborcus.mk
422 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
424 +# This file is part of the LibreOffice project.
426 +# This Source Code Form is subject to the terms of the Mozilla Public
427 +# License, v. 2.0. If a copy of the MPL was not distributed with this
428 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
431 +$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
433 +$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
436 +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.0.dylib,src/liborcus/.libs/liborcus-0.10.0.dylib))
437 +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.0.dylib,src/parser/.libs/liborcus-parser-0.10.0.dylib))
438 +else ifeq ($(filter IOS ANDROID,$(OS)),)
439 +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.so.0,src/liborcus/.libs/liborcus-0.10.so.0.0.0))
440 +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.so.0,src/parser/.libs/liborcus-parser-0.10.so.0.0.0))
443 +# vim: set noet sw=4 ts=4:
444 diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
445 index 90d453c..ff488bf 100644
446 --- a/external/liborcus/ExternalProject_liborcus.mk
447 +++ b/external/liborcus/ExternalProject_liborcus.mk
448 @@ -87,8 +87,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
450 MAKE=$(MAKE) ./configure \
456 $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
457 --disable-spreadsheet-model \
459 diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
461 index 0000000..c3b4eec
463 +++ b/external/liborcus/Library_orcus-parser.mk
465 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
467 +# This file is part of the LibreOffice project.
469 +# This Source Code Form is subject to the terms of the Mozilla Public
470 +# License, v. 2.0. If a copy of the MPL was not distributed with this
471 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
474 +$(eval $(call gb_Library_Library,orcus-parser))
476 +$(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
478 +$(eval $(call gb_Library_use_externals,orcus-parser,\
485 +$(eval $(call gb_Library_set_warnings_not_errors,orcus-parser))
487 +$(eval $(call gb_Library_set_include,orcus-parser,\
488 + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
492 +$(eval $(call gb_Library_add_defs,orcus-parser,\
493 + -DBOOST_ALL_NO_LIB \
494 + -D__ORCUS_PSR_BUILDING_DLL \
497 +$(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp))
499 +$(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
500 + UnpackedTarball/liborcus/src/parser/base64 \
501 + UnpackedTarball/liborcus/src/parser/cell_buffer \
502 + UnpackedTarball/liborcus/src/parser/css_parser_base \
503 + UnpackedTarball/liborcus/src/parser/css_types \
504 + UnpackedTarball/liborcus/src/parser/csv_parser_base \
505 + UnpackedTarball/liborcus/src/parser/exception \
506 + UnpackedTarball/liborcus/src/parser/parser_global \
507 + UnpackedTarball/liborcus/src/parser/pstring \
508 + UnpackedTarball/liborcus/src/parser/sax_parser_base \
509 + UnpackedTarball/liborcus/src/parser/sax_token_parser \
510 + UnpackedTarball/liborcus/src/parser/stream \
511 + UnpackedTarball/liborcus/src/parser/string_pool \
512 + UnpackedTarball/liborcus/src/parser/tokens \
513 + UnpackedTarball/liborcus/src/parser/types \
514 + UnpackedTarball/liborcus/src/parser/xml_namespace \
515 + UnpackedTarball/liborcus/src/parser/zip_archive \
516 + UnpackedTarball/liborcus/src/parser/zip_archive_stream \
519 +# vim: set noet sw=4 ts=4:
520 diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
522 index 0000000..ae98d5e
524 +++ b/external/liborcus/Library_orcus.mk
526 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
528 +# This file is part of the LibreOffice project.
530 +# This Source Code Form is subject to the terms of the Mozilla Public
531 +# License, v. 2.0. If a copy of the MPL was not distributed with this
532 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
535 +$(eval $(call gb_Library_Library,orcus))
537 +$(eval $(call gb_Library_use_unpacked,orcus,liborcus))
539 +$(eval $(call gb_Library_use_externals,orcus,\
547 +$(eval $(call gb_Library_set_warnings_not_errors,orcus))
549 +$(eval $(call gb_Library_set_include,orcus,\
550 + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
554 +$(eval $(call gb_Library_add_defs,orcus,\
555 + -DBOOST_ALL_NO_LIB \
556 + -D__ORCUS_BUILDING_DLL \
559 +$(eval $(call gb_Library_use_libraries,orcus,\
563 +$(eval $(call gb_Library_set_generated_cxx_suffix,orcus,cpp))
565 +$(eval $(call gb_Library_add_generated_exception_objects,orcus,\
566 + UnpackedTarball/liborcus/src/liborcus/config \
567 + UnpackedTarball/liborcus/src/liborcus/css_document_tree \
568 + UnpackedTarball/liborcus/src/liborcus/css_selector \
569 + UnpackedTarball/liborcus/src/liborcus/detection_result \
570 + UnpackedTarball/liborcus/src/liborcus/dom_tree \
571 + UnpackedTarball/liborcus/src/liborcus/format_detection \
572 + UnpackedTarball/liborcus/src/liborcus/global \
573 + UnpackedTarball/liborcus/src/liborcus/gnumeric_cell_context \
574 + UnpackedTarball/liborcus/src/liborcus/gnumeric_context \
575 + UnpackedTarball/liborcus/src/liborcus/gnumeric_detection_handler \
576 + UnpackedTarball/liborcus/src/liborcus/gnumeric_handler \
577 + UnpackedTarball/liborcus/src/liborcus/gnumeric_helper \
578 + UnpackedTarball/liborcus/src/liborcus/gnumeric_namespace_types \
579 + UnpackedTarball/liborcus/src/liborcus/gnumeric_sheet_context \
580 + UnpackedTarball/liborcus/src/liborcus/gnumeric_tokens \
581 + UnpackedTarball/liborcus/src/liborcus/interface \
582 + UnpackedTarball/liborcus/src/liborcus/measurement \
583 + UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
584 + UnpackedTarball/liborcus/src/liborcus/odf_para_context \
585 + UnpackedTarball/liborcus/src/liborcus/odf_styles \
586 + UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
587 + UnpackedTarball/liborcus/src/liborcus/odf_tokens \
588 + UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \
589 + UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \
590 + UnpackedTarball/liborcus/src/liborcus/ods_session_data \
591 + UnpackedTarball/liborcus/src/liborcus/ooxml_content_types \
592 + UnpackedTarball/liborcus/src/liborcus/ooxml_global \
593 + UnpackedTarball/liborcus/src/liborcus/ooxml_namespace_types \
594 + UnpackedTarball/liborcus/src/liborcus/ooxml_schemas \
595 + UnpackedTarball/liborcus/src/liborcus/ooxml_tokens \
596 + UnpackedTarball/liborcus/src/liborcus/ooxml_types \
597 + UnpackedTarball/liborcus/src/liborcus/opc_context \
598 + UnpackedTarball/liborcus/src/liborcus/opc_reader \
599 + UnpackedTarball/liborcus/src/liborcus/orcus_csv \
600 + UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
601 + UnpackedTarball/liborcus/src/liborcus/orcus_ods \
602 + UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
603 + UnpackedTarball/liborcus/src/liborcus/orcus_xml \
604 + UnpackedTarball/liborcus/src/liborcus/session_context \
605 + UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
606 + UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
607 + UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
608 + UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
609 + UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
610 + UnpackedTarball/liborcus/src/liborcus/xlsx_context \
611 + UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
612 + UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
613 + UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \
614 + UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \
615 + UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \
616 + UnpackedTarball/liborcus/src/liborcus/xlsx_sheet_context \
617 + UnpackedTarball/liborcus/src/liborcus/xlsx_table_context \
618 + UnpackedTarball/liborcus/src/liborcus/xlsx_types \
619 + UnpackedTarball/liborcus/src/liborcus/xlsx_workbook_context \
620 + UnpackedTarball/liborcus/src/liborcus/xml_context_base \
621 + UnpackedTarball/liborcus/src/liborcus/xml_context_global \
622 + UnpackedTarball/liborcus/src/liborcus/xml_map_tree \
623 + UnpackedTarball/liborcus/src/liborcus/xml_simple_stream_handler \
624 + UnpackedTarball/liborcus/src/liborcus/xml_stream_handler \
625 + UnpackedTarball/liborcus/src/liborcus/xml_stream_parser \
626 + UnpackedTarball/liborcus/src/liborcus/xml_structure_tree \
629 +# vim: set noet sw=4 ts=4:
630 diff --git a/external/liborcus/Module_liborcus.mk b/external/liborcus/Module_liborcus.mk
631 index 42f1715..e75b983 100644
632 --- a/external/liborcus/Module_liborcus.mk
633 +++ b/external/liborcus/Module_liborcus.mk
635 $(eval $(call gb_Module_Module,liborcus))
637 $(eval $(call gb_Module_add_targets,liborcus,\
638 - ExternalProject_liborcus \
639 UnpackedTarball_liborcus \
644 +$(eval $(call gb_Module_add_targets,liborcus,\
646 + Library_orcus-parser \
651 +$(eval $(call gb_Module_add_targets,liborcus,\
652 + ExternalPackage_liborcus \
653 + ExternalProject_liborcus \
658 # vim: set noet sw=4 ts=4:
659 diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
660 index 126f250..ae569ed 100644
661 --- a/external/liborcus/UnpackedTarball_liborcus.mk
662 +++ b/external/liborcus/UnpackedTarball_liborcus.mk
663 @@ -11,28 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
665 $(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
667 -$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
671 -# make config.sub recognize arm-linux-androideabi
672 -# liborcus_patches += liborcus_0.1.0-configure.patch
674 -# don't use dllimport
675 -liborcus_patches += liborcus_0.1.0-dllimport.patch
677 -ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
678 -liborcus_patches += visibility.patch
681 -# <https://gitorious.org/orcus/orcus/merge_requests/2#
682 -# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
683 -# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
685 -liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
686 +$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
688 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
689 - $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
690 + external/liborcus/0001-fix-dllexport-decls.patch \
691 + external/liborcus/0001-mark-more-symbols-as-public.patch \
692 + external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch \
693 + external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
696 # vim: set noet sw=4 ts=4:
697 diff --git a/external/liborcus/liborcus_0.1.0-configure.patch b/external/liborcus/liborcus_0.1.0-configure.patch
698 deleted file mode 100644
699 index ae8502e..0000000
700 --- a/external/liborcus/liborcus_0.1.0-configure.patch
706 - # Here we must recognize all the valid KERNEL-OS combinations.
707 - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
709 -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
710 -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
711 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
712 - kopensolaris*-gnu* | \
713 - storm-chaos* | os2-emx* | rtmk-nova*)
714 -@@ -1275,7 +1275,7 @@
715 - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
716 - | -chorusos* | -chorusrdb* | -cegcc* \
717 - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
718 -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
719 -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
720 - | -uxpv* | -beos* | -mpeix* | -udk* \
721 - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
722 - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
723 diff --git a/external/liborcus/liborcus_0.1.0-dllimport.patch b/external/liborcus/liborcus_0.1.0-dllimport.patch
724 deleted file mode 100644
725 index 8940155..0000000
726 --- a/external/liborcus/liborcus_0.1.0-dllimport.patch
729 ---- include/orcus/env.hpp
730 -+++ include/orcus/env.hpp
733 - #define ORCUS_DLLPUBLIC __declspec(dllexport)
735 -- #elif defined __ORCUS_STATIC_LIB
737 - #define ORCUS_DLLPUBLIC
740 -- #define ORCUS_DLLPUBLIC __attribute__ ((dllimport))
742 -- #define ORCUS_DLLPUBLIC __declspec(dllimport)
745 - #define ORCUS_DLLLOCAL
748 -- #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("default")))
749 -+ #define ORCUS_DLLPUBLIC
750 - #define ORCUS_DLLLOCAL __attribute__ ((visibility ("hidden")))
752 - #define ORCUS_DLLPUBLIC
753 diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
754 deleted file mode 100644
755 index 79d372c..0000000
756 --- a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
759 ---- configure.old 2013-10-15 04:17:59.000000000 +0200
760 -+++ configure 2015-02-09 23:41:48.525767041 +0100
761 -@@ -1471,7 +1471,7 @@ Optional Features:
762 - --disable-libtool-lock avoid locking (might break parallel builds)
763 - --enable-static-boost Prefer the static boost libraries over the shared
765 -- --disable-werror Treat all warnings as errors, useful for development
766 -+ --enable-werror Treat all warnings as errors, useful for development
767 - --enable-debug Build with debug features in mind.]
768 - --disable-spreadsheet-model
769 - Disable the spreadsheet model implementation in
770 -@@ -2592,7 +2592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
772 - ac_config_headers="$ac_config_headers config.h"
774 --am__api_version='1.12'
775 -+am__api_version='1.14'
778 - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
779 -@@ -2805,8 +2805,8 @@ if test x"${MISSING+set}" != xset; then
782 - # Use eval to expand $SHELL
783 --if eval "$MISSING --run true"; then
784 -- am_missing_run="$MISSING --run "
785 -+if eval "$MISSING --is-lightweight"; then
786 -+ am_missing_run="$MISSING "
789 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
790 -@@ -3046,6 +3046,45 @@ else
792 - rmdir .tst 2>/dev/null
794 -+# Check whether --enable-silent-rules was given.
795 -+if test "${enable_silent_rules+set}" = set; then :
796 -+ enableval=$enable_silent_rules;
799 -+case $enable_silent_rules in # (((
800 -+ yes) AM_DEFAULT_VERBOSITY=0;;
801 -+ no) AM_DEFAULT_VERBOSITY=1;;
802 -+ *) AM_DEFAULT_VERBOSITY=1;;
804 -+am_make=${MAKE-make}
805 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
806 -+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
807 -+if ${am_cv_make_support_nested_variables+:} false; then :
808 -+ $as_echo_n "(cached) " >&6
810 -+ if $as_echo 'TRUE=$(BAR$(V))
816 -+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
817 -+ am_cv_make_support_nested_variables=yes
819 -+ am_cv_make_support_nested_variables=no
822 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
823 -+$as_echo "$am_cv_make_support_nested_variables" >&6; }
824 -+if test $am_cv_make_support_nested_variables = yes; then
826 -+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
828 -+ AM_V=$AM_DEFAULT_VERBOSITY
829 -+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
833 - if test "`cd $srcdir && pwd`" != "`pwd`"; then
834 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
835 - # is not polluted with repeated "-I."
836 -@@ -3096,19 +3135,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
838 - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
841 -+# For better backward compatibility. To be removed once Automake 1.9.x
842 -+# dies out for good. For more background, see:
843 -+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
844 -+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
845 -+mkdir_p='$(MKDIR_P)'
847 - # We need awk for the "check" target. The system "awk" is bad on
849 - # Always define AMTAR for backward compatibility. Yes, it's still used
850 - # in the wild :-( We should find a proper way to deprecate it ...
851 - AMTAR='$${TAR-tar}'
854 -+# We'll loop over all known methods to create a tar archive until one works.
855 -+_am_tools='gnutar pax cpio none'
857 - am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
864 -+# POSIX will say in a future version that running "rm -f" with no argument
865 -+# is OK; and we want to be able to make that assumption in our Makefile
866 -+# recipes. So use an aggressive probe to check that the usage we want is
867 -+# actually supported "in the wild" to an acceptable degree.
868 -+# See automake bug#10828.
869 -+# To make any issue more visible, cause the running configure to be aborted
870 -+# by default if the 'rm' program in use doesn't match our expectations; the
871 -+# user can still override this though.
872 -+if rm -f && rm -fr && rm -rf; then : OK; else
876 -+Your 'rm' program seems unable to run without file operands specified
877 -+on the command line, even when the '-f' option is present. This is contrary
878 -+to the behaviour of most rm programs out there, and not conforming with
879 -+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
881 -+Please tell bug-automake@gnu.org about your system, including the value
882 -+of your $PATH and any error possibly output before this message. This
883 -+can help us improve future automake versions.
886 -+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
887 -+ echo 'Configuration will proceed anyway, since you have set the' >&2
888 -+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
892 -+Aborting the configuration process, to ensure you take notice of the issue.
894 -+You can download and install GNU coreutils to get an 'rm' implementation
895 -+that behaves properly: <http://www.gnu.org/software/coreutils/>.
897 -+If you want to complete the configuration process using your problematic
898 -+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
899 -+to "yes", and re-run configure.
902 -+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
905 - # Check whether --enable-silent-rules was given.
906 - if test "${enable_silent_rules+set}" = set; then :
907 - enableval=$enable_silent_rules;
908 -@@ -4011,6 +4101,65 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
909 - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
910 - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
913 -+ac_cpp='$CPP $CPPFLAGS'
914 -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
915 -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
916 -+ac_compiler_gnu=$ac_cv_c_compiler_gnu
917 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
918 -+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
919 -+if ${am_cv_prog_cc_c_o+:} false; then :
920 -+ $as_echo_n "(cached) " >&6
922 -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
923 -+/* end confdefs.h. */
933 -+ # Make sure it works both with $CC and with simple cc.
934 -+ # Following AC_PROG_CC_C_O, we do the test twice because some
935 -+ # compilers refuse to overwrite an existing .o file with -o,
936 -+ # though they will create one.
937 -+ am_cv_prog_cc_c_o=yes
938 -+ for am_i in 1 2; do
939 -+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
940 -+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
942 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
943 -+ (exit $ac_status); } \
944 -+ && test -f conftest2.$ac_objext; then
947 -+ am_cv_prog_cc_c_o=no
951 -+ rm -f core conftest*
954 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
955 -+$as_echo "$am_cv_prog_cc_c_o" >&6; }
956 -+if test "$am_cv_prog_cc_c_o" != yes; then
957 -+ # Losing compiler, so override with the script.
958 -+ # FIXME: It is wrong to rewrite CC.
959 -+ # But if we don't then we get into trouble of one sort or another.
960 -+ # A longer-term fix would be to have automake use am__CC in this case,
961 -+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
962 -+ CC="$am_aux_dir/compile $CC"
965 -+ac_cpp='$CXXCPP $CPPFLAGS'
966 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
967 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
968 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
971 - depcc="$CC" am_compiler_list=
973 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
974 -@@ -7073,7 +7222,7 @@ ia64-*-hpux*)
978 --x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
979 -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
980 - s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
981 - # Find out which ABI we are using.
982 - echo 'int i;' > conftest.$ac_ext
983 -@@ -7091,7 +7240,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
985 - LD="${LD-ld} -m elf_i386"
987 -- ppc64-*linux*|powerpc64-*linux*)
988 -+ powerpc64le-*linux*)
989 -+ LD="${LD-ld} -m elf32lppclinux"
991 -+ powerpc64-*linux*)
992 - LD="${LD-ld} -m elf32ppclinux"
995 -@@ -7110,7 +7262,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
997 - LD="${LD-ld} -m elf_x86_64"
999 -- ppc*-*linux*|powerpc*-*linux*)
1000 -+ powerpcle-*linux*)
1001 -+ LD="${LD-ld} -m elf64lppc"
1004 - LD="${LD-ld} -m elf64ppc"
1006 - s390*-*linux*|s390*-*tpf*)
1007 -@@ -11133,10 +11288,14 @@ fi
1008 - # before this can be enabled.
1009 - hardcode_into_libs=yes
1011 -+ # Add ABI-specific directories to the system library path.
1012 -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1014 - # Append ld.so.conf contents to the search path
1015 - if test -f /etc/ld.so.conf; then
1016 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
1017 -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1018 -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1022 - # We used to test for /lib/ld.so.1 and disable shared libraries on
1023 -@@ -14964,10 +15123,14 @@ fi
1024 - # before this can be enabled.
1025 - hardcode_into_libs=yes
1027 -+ # Add ABI-specific directories to the system library path.
1028 -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1030 - # Append ld.so.conf contents to the search path
1031 - if test -f /etc/ld.so.conf; then
1032 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
1033 -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1034 -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1038 - # We used to test for /lib/ld.so.1 and disable shared libraries on
1039 -@@ -16040,7 +16203,7 @@ $as_echo "#define BOOST_ALL_NO_LIB /**/"
1040 - # ======================
1041 - # Set required ixion api
1042 - # ======================
1043 --IXION_REQUIRED_API_VERSION=0.8
1044 -+IXION_REQUIRED_API_VERSION=0.10
1048 -@@ -16049,7 +16212,7 @@ IXION_REQUIRED_API_VERSION=0.8
1049 - ORCUS_API_VERSION=0.8
1052 --echo "$as_me: this is boost.m4 serial 18" >&5
1053 -+echo "$as_me: this is boost.m4 serial 24" >&5
1054 - boost_save_IFS=$IFS
1055 - boost_version_req=1.36
1057 -@@ -16193,17 +16356,30 @@ $as_echo_n "checking for Boost's header
1058 - if ${boost_cv_lib_version+:} false; then :
1059 - $as_echo_n "(cached) " >&6
1061 -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1063 -+ac_cpp='$CXXCPP $CPPFLAGS'
1064 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1065 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1066 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1067 -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1068 - /* end confdefs.h. */
1069 - #include <boost/version.hpp>
1070 - boost-lib-version = BOOST_LIB_VERSION
1072 - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1074 -+ grep -Ev '^(conftest.cpp| *command-line arguments :)' |
1076 -- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
1078 -+ $SED -n -e "/^ *boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
1079 - boost_cv_lib_version=`cat conftest.i`
1083 -+ac_cpp='$CXXCPP $CPPFLAGS'
1084 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1085 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1086 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1089 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
1090 -@@ -16212,7 +16387,7 @@ $as_echo "$boost_cv_lib_version" >&6; }
1091 - boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
1092 - case $boost_major_version in #(
1094 -- as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5
1095 -+ as_fn_error $? "invalid value: boost_major_version='$boost_major_version'" "$LINENO" 5
1099 -@@ -16244,14 +16419,53 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1100 - # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
1101 - # the same defines as GCC's).
1103 -+ "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC && \
1104 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1105 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw50" \
1106 -+ "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc50" \
1107 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC && \
1108 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1109 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw410" \
1110 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC @ gcc410" \
1111 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC && \
1112 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1113 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw49" \
1114 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC @ gcc49" \
1115 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC && \
1116 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1117 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw48" \
1118 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC @ gcc48" \
1119 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC && \
1120 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1121 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw47" \
1122 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC @ gcc47" \
1123 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC && \
1124 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1125 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw46" \
1126 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC @ gcc46" \
1127 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC && \
1128 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1129 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw45" \
1130 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC @ gcc45" \
1131 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC && \
1132 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1133 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw44" \
1134 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc44" \
1135 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC && \
1136 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1137 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw43" \
1138 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \
1139 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC && \
1140 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1141 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw42" \
1142 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc42" \
1143 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC && \
1144 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1145 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw41" \
1146 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc41" \
1147 -+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC && \
1148 -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1149 -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw40" \
1150 - "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc40" \
1151 - "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
1152 - && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
1153 -@@ -16338,6 +16552,11 @@ else
1156 - # Check whether we do better use `mt' even though we weren't ask to.
1158 -+ac_cpp='$CXXCPP $CPPFLAGS'
1159 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1160 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1161 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1162 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1163 - /* end confdefs.h. */
1165 -@@ -16361,6 +16580,11 @@ else
1166 - boost_guess_use_mt=false
1168 - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1170 -+ac_cpp='$CXXCPP $CPPFLAGS'
1171 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1172 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1173 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1175 - if test x"$boost_cv_inc_path" = xno; then
1176 - { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
1177 -@@ -16402,13 +16626,6 @@ fi
1179 - boost_save_CPPFLAGS=$CPPFLAGS
1180 - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1181 --# Now let's try to find the library. The algorithm is as follows: first look
1182 --# for a given library name according to the user's PREFERRED-RT-OPT. For each
1183 --# library name, we prefer to use the ones that carry the tag (toolset name).
1184 --# Each library is searched through the various standard paths were Boost is
1185 --# usually installed. If we can't find the standard variants, we try to
1186 --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
1187 --# but there's -obviously- libboost_threads-mt.dylib).
1188 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5
1189 - $as_echo_n "checking for the Boost system library... " >&6; }
1190 - if ${boost_cv_lib_system+:} false; then :
1191 -@@ -16416,19 +16633,19 @@ if ${boost_cv_lib_system+:} false; then
1193 - boost_cv_lib_system=no
1195 -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1196 -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1197 -- *) boost_mt=; boost_rtopt=;;
1198 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1199 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1200 -+ (*) boost_mt=; boost_rtopt=;;
1202 - if test $enable_static_boost = yes; then
1203 - boost_rtopt="s$boost_rtopt"
1205 - # Find the proper debug variant depending on what we've been asked to find.
1206 - case $boost_rtopt in #(
1207 -- *d*) boost_rt_d=$boost_rtopt;; #(
1208 -- *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1209 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
1210 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1211 - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
1212 -- *) boost_rt_d='-d';;
1213 -+ (*) boost_rt_d='-d';;
1215 - # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
1216 - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
1217 -@@ -16459,21 +16676,22 @@ fi
1218 - rm -f core conftest.err conftest.$ac_objext
1219 - ac_objext=$boost_save_ac_objext
1220 - boost_failed_libs=
1221 --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
1223 -+# Don't bother to ident the following nested for loops, only the 2
1224 -+# innermost ones matter.
1225 -+for boost_lib_ in system; do
1226 - for boost_tag_ in -$boost_cv_lib_tag ''; do
1227 - for boost_ver_ in -$boost_cv_lib_version ''; do
1228 - for boost_mt_ in $boost_mt -mt ''; do
1229 - for boost_rtopt_ in $boost_rtopt '' -d; do
1230 - for boost_lib in \
1231 -- boost_system$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1232 -- boost_system$boost_tag_$boost_rtopt_$boost_ver_ \
1233 -- boost_system$boost_tag_$boost_mt_$boost_ver_ \
1234 -- boost_system$boost_tag_$boost_ver_
1235 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1236 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
1237 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
1238 -+ boost_$boost_lib_$boost_tag_$boost_ver_
1240 - # Avoid testing twice the same lib
1241 - case $boost_failed_libs in #(
1242 -- *@$boost_lib@*) continue;;
1243 -+ (*@$boost_lib@*) continue;;
1245 - # If with_boost is empty, we'll search in /lib first, which is not quite
1246 - # right so instead we'll try to a location based on where the headers are.
1247 -@@ -16483,14 +16701,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
1248 - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
1249 - "$with_boost" C:/Boost/lib /lib*
1251 -- test -e "$boost_ldpath" || continue
1252 -+ # Don't waste time with directories that don't exist.
1253 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
1256 - boost_save_LDFLAGS=$LDFLAGS
1257 - # Are we looking for a static library?
1258 - case $boost_ldpath:$boost_rtopt_ in #(
1259 -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1260 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1261 - boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext"
1262 - test -e "$boost_cv_lib_system_LIBS" || continue;; #(
1263 -- *) # No: use -lboost_foo to find the shared library.
1264 -+ (*) # No: use -lboost_foo to find the shared library.
1265 - boost_cv_lib_system_LIBS="-l$boost_lib";;
1267 - boost_save_LIBS=$LIBS
1268 -@@ -16519,11 +16740,11 @@ $as_echo "$ac_try_echo"; } >&5
1270 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1271 - test $ac_status = 0; } && {
1272 -- test -z "$ac_cxx_werror_flag" ||
1273 -- test ! -s conftest.err
1274 -+ test -z "$ac_cxx_werror_flag" ||
1275 -+ test ! -s conftest.err
1276 - } && test -s conftest$ac_exeext && {
1277 -- test "$cross_compiling" = yes ||
1278 -- $as_executable_p conftest$ac_exeext
1279 -+ test "$cross_compiling" = yes ||
1280 -+ $as_executable_p conftest$ac_exeext
1282 - boost_cv_lib_system=yes
1284 -@@ -16542,17 +16763,22 @@ rm -f core conftest.err conftest_ipa8_co
1285 - LDFLAGS=$boost_save_LDFLAGS
1286 - LIBS=$boost_save_LIBS
1287 - if test x"$boost_cv_lib_system" = xyes; then
1288 -- # Check or used cached result of whether or not using -R or -rpath makes sense.
1289 -- # Some implementations of ld, such as for Mac OSX, require -rpath but
1290 -- # -R is the flag known to work on other systems.
1291 -- # https://github.com/tsuna/boost.m4/issues/19
1292 -+ # Check or used cached result of whether or not using -R or
1293 -+ # -rpath makes sense. Some implementations of ld, such as for
1294 -+ # Mac OSX, require -rpath but -R is the flag known to work on
1295 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
1296 - if ${boost_cv_rpath_link_ldflag+:} false; then :
1297 - $as_echo_n "(cached) " >&6
1299 -- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1300 -- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1301 -- LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS"
1302 -- rm -f conftest$ac_exeext
1303 -+ case $boost_ldpath in
1304 -+ '') # Nothing to do.
1305 -+ boost_cv_rpath_link_ldflag=
1306 -+ boost_rpath_link_ldflag_found=yes;;
1308 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1309 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1310 -+ LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS"
1311 -+ rm -f conftest$ac_exeext
1312 - boost_save_ac_ext=$ac_ext
1313 - boost_use_source=:
1314 - # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
1315 -@@ -16575,14 +16801,14 @@ $as_echo "$ac_try_echo"; } >&5
1317 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1318 - test $ac_status = 0; } && {
1319 -- test -z "$ac_cxx_werror_flag" ||
1320 -- test ! -s conftest.err
1321 -+ test -z "$ac_cxx_werror_flag" ||
1322 -+ test ! -s conftest.err
1323 - } && test -s conftest$ac_exeext && {
1324 -- test "$cross_compiling" = yes ||
1325 -- $as_executable_p conftest$ac_exeext
1326 -+ test "$cross_compiling" = yes ||
1327 -+ $as_executable_p conftest$ac_exeext
1329 - boost_rpath_link_ldflag_found=yes
1333 - if $boost_use_source; then
1334 - $as_echo "$as_me: failed program was:" >&5
1335 -@@ -16595,7 +16821,9 @@ ac_objext=$boost_save_ac_objext
1336 - ac_ext=$boost_save_ac_ext
1337 - rm -f core conftest.err conftest_ipa8_conftest.oo \
1338 - conftest$ac_exeext
1343 - if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
1344 - as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
1346 -@@ -16604,9 +16832,10 @@ fi
1350 -- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1351 -+ test x"$boost_ldpath" != x &&
1352 -+ boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1353 - boost_cv_lib_system_LDPATH="$boost_ldpath"
1357 - boost_failed_libs="$boost_failed_libs@$boost_lib@"
1359 -@@ -16616,13 +16845,14 @@ done
1364 - rm -f conftest.$ac_objext
1367 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5
1368 - $as_echo "$boost_cv_lib_system" >&6; }
1369 - case $boost_cv_lib_system in #(
1370 -- no) $as_echo "$as_me: failed program was:" >&5
1371 -+ (no) $as_echo "$as_me: failed program was:" >&5
1372 - sed 's/^/| /' conftest.$ac_ext >&5
1374 - as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5
1375 -@@ -16650,11 +16880,11 @@ fi
1376 - if test "${enable_werror+set}" = set; then :
1377 - enableval=$enable_werror; enable_werror="$enableval"
1379 -- enable_werror=yes
1384 --if test x"$enable_werror" != "xno"; then :
1385 -+if test x"$enable_werror" == "xyes"; then :
1387 - CXXFLAGS="$CXXFLAGS -Werror"
1389 -@@ -16936,13 +17166,6 @@ fi
1391 - boost_save_CPPFLAGS=$CPPFLAGS
1392 - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1393 --# Now let's try to find the library. The algorithm is as follows: first look
1394 --# for a given library name according to the user's PREFERRED-RT-OPT. For each
1395 --# library name, we prefer to use the ones that carry the tag (toolset name).
1396 --# Each library is searched through the various standard paths were Boost is
1397 --# usually installed. If we can't find the standard variants, we try to
1398 --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
1399 --# but there's -obviously- libboost_threads-mt.dylib).
1400 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost iostreams library" >&5
1401 - $as_echo_n "checking for the Boost iostreams library... " >&6; }
1402 - if ${boost_cv_lib_iostreams+:} false; then :
1403 -@@ -16950,19 +17173,19 @@ if ${boost_cv_lib_iostreams+:} false; th
1405 - boost_cv_lib_iostreams=no
1407 -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1408 -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1409 -- *) boost_mt=; boost_rtopt=;;
1410 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1411 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1412 -+ (*) boost_mt=; boost_rtopt=;;
1414 - if test $enable_static_boost = yes; then
1415 - boost_rtopt="s$boost_rtopt"
1417 - # Find the proper debug variant depending on what we've been asked to find.
1418 - case $boost_rtopt in #(
1419 -- *d*) boost_rt_d=$boost_rtopt;; #(
1420 -- *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1421 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
1422 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1423 - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
1424 -- *) boost_rt_d='-d';;
1425 -+ (*) boost_rt_d='-d';;
1427 - # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
1428 - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
1429 -@@ -16993,21 +17216,22 @@ fi
1430 - rm -f core conftest.err conftest.$ac_objext
1431 - ac_objext=$boost_save_ac_objext
1432 - boost_failed_libs=
1433 --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
1435 -+# Don't bother to ident the following nested for loops, only the 2
1436 -+# innermost ones matter.
1437 -+for boost_lib_ in iostreams; do
1438 - for boost_tag_ in -$boost_cv_lib_tag ''; do
1439 - for boost_ver_ in -$boost_cv_lib_version ''; do
1440 - for boost_mt_ in $boost_mt -mt ''; do
1441 - for boost_rtopt_ in $boost_rtopt '' -d; do
1442 - for boost_lib in \
1443 -- boost_iostreams$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1444 -- boost_iostreams$boost_tag_$boost_rtopt_$boost_ver_ \
1445 -- boost_iostreams$boost_tag_$boost_mt_$boost_ver_ \
1446 -- boost_iostreams$boost_tag_$boost_ver_
1447 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1448 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
1449 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
1450 -+ boost_$boost_lib_$boost_tag_$boost_ver_
1452 - # Avoid testing twice the same lib
1453 - case $boost_failed_libs in #(
1454 -- *@$boost_lib@*) continue;;
1455 -+ (*@$boost_lib@*) continue;;
1457 - # If with_boost is empty, we'll search in /lib first, which is not quite
1458 - # right so instead we'll try to a location based on where the headers are.
1459 -@@ -17017,14 +17241,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
1460 - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
1461 - "$with_boost" C:/Boost/lib /lib*
1463 -- test -e "$boost_ldpath" || continue
1464 -+ # Don't waste time with directories that don't exist.
1465 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
1468 - boost_save_LDFLAGS=$LDFLAGS
1469 - # Are we looking for a static library?
1470 - case $boost_ldpath:$boost_rtopt_ in #(
1471 -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1472 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1473 - boost_cv_lib_iostreams_LIBS="$boost_ldpath/lib$boost_lib.$libext"
1474 - test -e "$boost_cv_lib_iostreams_LIBS" || continue;; #(
1475 -- *) # No: use -lboost_foo to find the shared library.
1476 -+ (*) # No: use -lboost_foo to find the shared library.
1477 - boost_cv_lib_iostreams_LIBS="-l$boost_lib";;
1479 - boost_save_LIBS=$LIBS
1480 -@@ -17053,11 +17280,11 @@ $as_echo "$ac_try_echo"; } >&5
1482 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1483 - test $ac_status = 0; } && {
1484 -- test -z "$ac_cxx_werror_flag" ||
1485 -- test ! -s conftest.err
1486 -+ test -z "$ac_cxx_werror_flag" ||
1487 -+ test ! -s conftest.err
1488 - } && test -s conftest$ac_exeext && {
1489 -- test "$cross_compiling" = yes ||
1490 -- $as_executable_p conftest$ac_exeext
1491 -+ test "$cross_compiling" = yes ||
1492 -+ $as_executable_p conftest$ac_exeext
1494 - boost_cv_lib_iostreams=yes
1496 -@@ -17076,17 +17303,22 @@ rm -f core conftest.err conftest_ipa8_co
1497 - LDFLAGS=$boost_save_LDFLAGS
1498 - LIBS=$boost_save_LIBS
1499 - if test x"$boost_cv_lib_iostreams" = xyes; then
1500 -- # Check or used cached result of whether or not using -R or -rpath makes sense.
1501 -- # Some implementations of ld, such as for Mac OSX, require -rpath but
1502 -- # -R is the flag known to work on other systems.
1503 -- # https://github.com/tsuna/boost.m4/issues/19
1504 -+ # Check or used cached result of whether or not using -R or
1505 -+ # -rpath makes sense. Some implementations of ld, such as for
1506 -+ # Mac OSX, require -rpath but -R is the flag known to work on
1507 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
1508 - if ${boost_cv_rpath_link_ldflag+:} false; then :
1509 - $as_echo_n "(cached) " >&6
1511 -- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1512 -- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1513 -- LIBS="$boost_save_LIBS $boost_cv_lib_iostreams_LIBS"
1514 -- rm -f conftest$ac_exeext
1515 -+ case $boost_ldpath in
1516 -+ '') # Nothing to do.
1517 -+ boost_cv_rpath_link_ldflag=
1518 -+ boost_rpath_link_ldflag_found=yes;;
1520 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1521 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1522 -+ LIBS="$boost_save_LIBS $boost_cv_lib_iostreams_LIBS"
1523 -+ rm -f conftest$ac_exeext
1524 - boost_save_ac_ext=$ac_ext
1525 - boost_use_source=:
1526 - # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
1527 -@@ -17109,14 +17341,14 @@ $as_echo "$ac_try_echo"; } >&5
1529 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1530 - test $ac_status = 0; } && {
1531 -- test -z "$ac_cxx_werror_flag" ||
1532 -- test ! -s conftest.err
1533 -+ test -z "$ac_cxx_werror_flag" ||
1534 -+ test ! -s conftest.err
1535 - } && test -s conftest$ac_exeext && {
1536 -- test "$cross_compiling" = yes ||
1537 -- $as_executable_p conftest$ac_exeext
1538 -+ test "$cross_compiling" = yes ||
1539 -+ $as_executable_p conftest$ac_exeext
1541 - boost_rpath_link_ldflag_found=yes
1545 - if $boost_use_source; then
1546 - $as_echo "$as_me: failed program was:" >&5
1547 -@@ -17129,7 +17361,9 @@ ac_objext=$boost_save_ac_objext
1548 - ac_ext=$boost_save_ac_ext
1549 - rm -f core conftest.err conftest_ipa8_conftest.oo \
1550 - conftest$ac_exeext
1555 - if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
1556 - as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
1558 -@@ -17138,9 +17372,10 @@ fi
1562 -- boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1563 -+ test x"$boost_ldpath" != x &&
1564 -+ boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1565 - boost_cv_lib_iostreams_LDPATH="$boost_ldpath"
1569 - boost_failed_libs="$boost_failed_libs@$boost_lib@"
1571 -@@ -17150,13 +17385,14 @@ done
1576 - rm -f conftest.$ac_objext
1579 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_iostreams" >&5
1580 - $as_echo "$boost_cv_lib_iostreams" >&6; }
1581 - case $boost_cv_lib_iostreams in #(
1582 -- no) $as_echo "$as_me: failed program was:" >&5
1583 -+ (no) $as_echo "$as_me: failed program was:" >&5
1584 - sed 's/^/| /' conftest.$ac_ext >&5
1586 - as_fn_error $? "cannot find the flags to link with Boost iostreams" "$LINENO" 5
1587 -@@ -17221,13 +17457,6 @@ fi
1589 - boost_save_CPPFLAGS=$CPPFLAGS
1590 - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1591 --# Now let's try to find the library. The algorithm is as follows: first look
1592 --# for a given library name according to the user's PREFERRED-RT-OPT. For each
1593 --# library name, we prefer to use the ones that carry the tag (toolset name).
1594 --# Each library is searched through the various standard paths were Boost is
1595 --# usually installed. If we can't find the standard variants, we try to
1596 --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
1597 --# but there's -obviously- libboost_threads-mt.dylib).
1598 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost program_options library" >&5
1599 - $as_echo_n "checking for the Boost program_options library... " >&6; }
1600 - if ${boost_cv_lib_program_options+:} false; then :
1601 -@@ -17235,19 +17464,19 @@ if ${boost_cv_lib_program_options+:} fal
1603 - boost_cv_lib_program_options=no
1605 -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1606 -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1607 -- *) boost_mt=; boost_rtopt=;;
1608 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1609 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1610 -+ (*) boost_mt=; boost_rtopt=;;
1612 - if test $enable_static_boost = yes; then
1613 - boost_rtopt="s$boost_rtopt"
1615 - # Find the proper debug variant depending on what we've been asked to find.
1616 - case $boost_rtopt in #(
1617 -- *d*) boost_rt_d=$boost_rtopt;; #(
1618 -- *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1619 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
1620 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1621 - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
1622 -- *) boost_rt_d='-d';;
1623 -+ (*) boost_rt_d='-d';;
1625 - # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
1626 - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
1627 -@@ -17278,21 +17507,22 @@ fi
1628 - rm -f core conftest.err conftest.$ac_objext
1629 - ac_objext=$boost_save_ac_objext
1630 - boost_failed_libs=
1631 --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
1633 -+# Don't bother to ident the following nested for loops, only the 2
1634 -+# innermost ones matter.
1635 -+for boost_lib_ in program_options; do
1636 - for boost_tag_ in -$boost_cv_lib_tag ''; do
1637 - for boost_ver_ in -$boost_cv_lib_version ''; do
1638 - for boost_mt_ in $boost_mt -mt ''; do
1639 - for boost_rtopt_ in $boost_rtopt '' -d; do
1640 - for boost_lib in \
1641 -- boost_program_options$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1642 -- boost_program_options$boost_tag_$boost_rtopt_$boost_ver_ \
1643 -- boost_program_options$boost_tag_$boost_mt_$boost_ver_ \
1644 -- boost_program_options$boost_tag_$boost_ver_
1645 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1646 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
1647 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
1648 -+ boost_$boost_lib_$boost_tag_$boost_ver_
1650 - # Avoid testing twice the same lib
1651 - case $boost_failed_libs in #(
1652 -- *@$boost_lib@*) continue;;
1653 -+ (*@$boost_lib@*) continue;;
1655 - # If with_boost is empty, we'll search in /lib first, which is not quite
1656 - # right so instead we'll try to a location based on where the headers are.
1657 -@@ -17302,14 +17532,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
1658 - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
1659 - "$with_boost" C:/Boost/lib /lib*
1661 -- test -e "$boost_ldpath" || continue
1662 -+ # Don't waste time with directories that don't exist.
1663 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
1666 - boost_save_LDFLAGS=$LDFLAGS
1667 - # Are we looking for a static library?
1668 - case $boost_ldpath:$boost_rtopt_ in #(
1669 -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1670 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1671 - boost_cv_lib_program_options_LIBS="$boost_ldpath/lib$boost_lib.$libext"
1672 - test -e "$boost_cv_lib_program_options_LIBS" || continue;; #(
1673 -- *) # No: use -lboost_foo to find the shared library.
1674 -+ (*) # No: use -lboost_foo to find the shared library.
1675 - boost_cv_lib_program_options_LIBS="-l$boost_lib";;
1677 - boost_save_LIBS=$LIBS
1678 -@@ -17338,11 +17571,11 @@ $as_echo "$ac_try_echo"; } >&5
1680 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1681 - test $ac_status = 0; } && {
1682 -- test -z "$ac_cxx_werror_flag" ||
1683 -- test ! -s conftest.err
1684 -+ test -z "$ac_cxx_werror_flag" ||
1685 -+ test ! -s conftest.err
1686 - } && test -s conftest$ac_exeext && {
1687 -- test "$cross_compiling" = yes ||
1688 -- $as_executable_p conftest$ac_exeext
1689 -+ test "$cross_compiling" = yes ||
1690 -+ $as_executable_p conftest$ac_exeext
1692 - boost_cv_lib_program_options=yes
1694 -@@ -17361,17 +17594,22 @@ rm -f core conftest.err conftest_ipa8_co
1695 - LDFLAGS=$boost_save_LDFLAGS
1696 - LIBS=$boost_save_LIBS
1697 - if test x"$boost_cv_lib_program_options" = xyes; then
1698 -- # Check or used cached result of whether or not using -R or -rpath makes sense.
1699 -- # Some implementations of ld, such as for Mac OSX, require -rpath but
1700 -- # -R is the flag known to work on other systems.
1701 -- # https://github.com/tsuna/boost.m4/issues/19
1702 -+ # Check or used cached result of whether or not using -R or
1703 -+ # -rpath makes sense. Some implementations of ld, such as for
1704 -+ # Mac OSX, require -rpath but -R is the flag known to work on
1705 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
1706 - if ${boost_cv_rpath_link_ldflag+:} false; then :
1707 - $as_echo_n "(cached) " >&6
1709 -- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1710 -- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1711 -- LIBS="$boost_save_LIBS $boost_cv_lib_program_options_LIBS"
1712 -- rm -f conftest$ac_exeext
1713 -+ case $boost_ldpath in
1714 -+ '') # Nothing to do.
1715 -+ boost_cv_rpath_link_ldflag=
1716 -+ boost_rpath_link_ldflag_found=yes;;
1718 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1719 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1720 -+ LIBS="$boost_save_LIBS $boost_cv_lib_program_options_LIBS"
1721 -+ rm -f conftest$ac_exeext
1722 - boost_save_ac_ext=$ac_ext
1723 - boost_use_source=:
1724 - # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
1725 -@@ -17394,14 +17632,14 @@ $as_echo "$ac_try_echo"; } >&5
1727 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1728 - test $ac_status = 0; } && {
1729 -- test -z "$ac_cxx_werror_flag" ||
1730 -- test ! -s conftest.err
1731 -+ test -z "$ac_cxx_werror_flag" ||
1732 -+ test ! -s conftest.err
1733 - } && test -s conftest$ac_exeext && {
1734 -- test "$cross_compiling" = yes ||
1735 -- $as_executable_p conftest$ac_exeext
1736 -+ test "$cross_compiling" = yes ||
1737 -+ $as_executable_p conftest$ac_exeext
1739 - boost_rpath_link_ldflag_found=yes
1743 - if $boost_use_source; then
1744 - $as_echo "$as_me: failed program was:" >&5
1745 -@@ -17414,7 +17652,9 @@ ac_objext=$boost_save_ac_objext
1746 - ac_ext=$boost_save_ac_ext
1747 - rm -f core conftest.err conftest_ipa8_conftest.oo \
1748 - conftest$ac_exeext
1753 - if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
1754 - as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
1756 -@@ -17423,9 +17663,10 @@ fi
1760 -- boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1761 -+ test x"$boost_ldpath" != x &&
1762 -+ boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1763 - boost_cv_lib_program_options_LDPATH="$boost_ldpath"
1767 - boost_failed_libs="$boost_failed_libs@$boost_lib@"
1769 -@@ -17435,13 +17676,14 @@ done
1774 - rm -f conftest.$ac_objext
1777 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_program_options" >&5
1778 - $as_echo "$boost_cv_lib_program_options" >&6; }
1779 - case $boost_cv_lib_program_options in #(
1780 -- no) $as_echo "$as_me: failed program was:" >&5
1781 -+ (no) $as_echo "$as_me: failed program was:" >&5
1782 - sed 's/^/| /' conftest.$ac_ext >&5
1784 - as_fn_error $? "cannot find the flags to link with Boost program_options" "$LINENO" 5
1785 -@@ -17465,7 +17707,7 @@ fi
1786 - # added as of 1.35.0. If we have a version <1.35, we must not attempt to
1787 - # find Boost.System as it didn't exist by then.
1788 - if test $boost_major_version -ge 135; then
1789 --if test x"$boost_cv_inc_path" = xno; then
1790 -+ if test x"$boost_cv_inc_path" = xno; then
1791 - { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
1792 - $as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;}
1794 -@@ -17505,13 +17747,6 @@ fi
1796 - boost_save_CPPFLAGS=$CPPFLAGS
1797 - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1798 --# Now let's try to find the library. The algorithm is as follows: first look
1799 --# for a given library name according to the user's PREFERRED-RT-OPT. For each
1800 --# library name, we prefer to use the ones that carry the tag (toolset name).
1801 --# Each library is searched through the various standard paths were Boost is
1802 --# usually installed. If we can't find the standard variants, we try to
1803 --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
1804 --# but there's -obviously- libboost_threads-mt.dylib).
1805 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5
1806 - $as_echo_n "checking for the Boost system library... " >&6; }
1807 - if ${boost_cv_lib_system+:} false; then :
1808 -@@ -17519,19 +17754,19 @@ if ${boost_cv_lib_system+:} false; then
1810 - boost_cv_lib_system=no
1812 -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1813 -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1814 -- *) boost_mt=; boost_rtopt=;;
1815 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
1816 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
1817 -+ (*) boost_mt=; boost_rtopt=;;
1819 - if test $enable_static_boost = yes; then
1820 - boost_rtopt="s$boost_rtopt"
1822 - # Find the proper debug variant depending on what we've been asked to find.
1823 - case $boost_rtopt in #(
1824 -- *d*) boost_rt_d=$boost_rtopt;; #(
1825 -- *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1826 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
1827 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
1828 - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
1829 -- *) boost_rt_d='-d';;
1830 -+ (*) boost_rt_d='-d';;
1832 - # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
1833 - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
1834 -@@ -17562,21 +17797,22 @@ fi
1835 - rm -f core conftest.err conftest.$ac_objext
1836 - ac_objext=$boost_save_ac_objext
1837 - boost_failed_libs=
1838 --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
1840 -+# Don't bother to ident the following nested for loops, only the 2
1841 -+# innermost ones matter.
1842 -+for boost_lib_ in system; do
1843 - for boost_tag_ in -$boost_cv_lib_tag ''; do
1844 - for boost_ver_ in -$boost_cv_lib_version ''; do
1845 - for boost_mt_ in $boost_mt -mt ''; do
1846 - for boost_rtopt_ in $boost_rtopt '' -d; do
1847 - for boost_lib in \
1848 -- boost_system$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1849 -- boost_system$boost_tag_$boost_rtopt_$boost_ver_ \
1850 -- boost_system$boost_tag_$boost_mt_$boost_ver_ \
1851 -- boost_system$boost_tag_$boost_ver_
1852 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
1853 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
1854 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
1855 -+ boost_$boost_lib_$boost_tag_$boost_ver_
1857 - # Avoid testing twice the same lib
1858 - case $boost_failed_libs in #(
1859 -- *@$boost_lib@*) continue;;
1860 -+ (*@$boost_lib@*) continue;;
1862 - # If with_boost is empty, we'll search in /lib first, which is not quite
1863 - # right so instead we'll try to a location based on where the headers are.
1864 -@@ -17586,14 +17822,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
1865 - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
1866 - "$with_boost" C:/Boost/lib /lib*
1868 -- test -e "$boost_ldpath" || continue
1869 -+ # Don't waste time with directories that don't exist.
1870 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
1873 - boost_save_LDFLAGS=$LDFLAGS
1874 - # Are we looking for a static library?
1875 - case $boost_ldpath:$boost_rtopt_ in #(
1876 -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1877 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
1878 - boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext"
1879 - test -e "$boost_cv_lib_system_LIBS" || continue;; #(
1880 -- *) # No: use -lboost_foo to find the shared library.
1881 -+ (*) # No: use -lboost_foo to find the shared library.
1882 - boost_cv_lib_system_LIBS="-l$boost_lib";;
1884 - boost_save_LIBS=$LIBS
1885 -@@ -17622,11 +17861,11 @@ $as_echo "$ac_try_echo"; } >&5
1887 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1888 - test $ac_status = 0; } && {
1889 -- test -z "$ac_cxx_werror_flag" ||
1890 -- test ! -s conftest.err
1891 -+ test -z "$ac_cxx_werror_flag" ||
1892 -+ test ! -s conftest.err
1893 - } && test -s conftest$ac_exeext && {
1894 -- test "$cross_compiling" = yes ||
1895 -- $as_executable_p conftest$ac_exeext
1896 -+ test "$cross_compiling" = yes ||
1897 -+ $as_executable_p conftest$ac_exeext
1899 - boost_cv_lib_system=yes
1901 -@@ -17645,17 +17884,22 @@ rm -f core conftest.err conftest_ipa8_co
1902 - LDFLAGS=$boost_save_LDFLAGS
1903 - LIBS=$boost_save_LIBS
1904 - if test x"$boost_cv_lib_system" = xyes; then
1905 -- # Check or used cached result of whether or not using -R or -rpath makes sense.
1906 -- # Some implementations of ld, such as for Mac OSX, require -rpath but
1907 -- # -R is the flag known to work on other systems.
1908 -- # https://github.com/tsuna/boost.m4/issues/19
1909 -+ # Check or used cached result of whether or not using -R or
1910 -+ # -rpath makes sense. Some implementations of ld, such as for
1911 -+ # Mac OSX, require -rpath but -R is the flag known to work on
1912 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
1913 - if ${boost_cv_rpath_link_ldflag+:} false; then :
1914 - $as_echo_n "(cached) " >&6
1916 -- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1917 -- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1918 -- LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS"
1919 -- rm -f conftest$ac_exeext
1920 -+ case $boost_ldpath in
1921 -+ '') # Nothing to do.
1922 -+ boost_cv_rpath_link_ldflag=
1923 -+ boost_rpath_link_ldflag_found=yes;;
1925 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
1926 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1927 -+ LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS"
1928 -+ rm -f conftest$ac_exeext
1929 - boost_save_ac_ext=$ac_ext
1930 - boost_use_source=:
1931 - # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
1932 -@@ -17678,14 +17922,14 @@ $as_echo "$ac_try_echo"; } >&5
1934 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1935 - test $ac_status = 0; } && {
1936 -- test -z "$ac_cxx_werror_flag" ||
1937 -- test ! -s conftest.err
1938 -+ test -z "$ac_cxx_werror_flag" ||
1939 -+ test ! -s conftest.err
1940 - } && test -s conftest$ac_exeext && {
1941 -- test "$cross_compiling" = yes ||
1942 -- $as_executable_p conftest$ac_exeext
1943 -+ test "$cross_compiling" = yes ||
1944 -+ $as_executable_p conftest$ac_exeext
1946 - boost_rpath_link_ldflag_found=yes
1950 - if $boost_use_source; then
1951 - $as_echo "$as_me: failed program was:" >&5
1952 -@@ -17698,7 +17942,9 @@ ac_objext=$boost_save_ac_objext
1953 - ac_ext=$boost_save_ac_ext
1954 - rm -f core conftest.err conftest_ipa8_conftest.oo \
1955 - conftest$ac_exeext
1960 - if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
1961 - as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
1963 -@@ -17707,9 +17953,10 @@ fi
1967 -- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1968 -+ test x"$boost_ldpath" != x &&
1969 -+ boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
1970 - boost_cv_lib_system_LDPATH="$boost_ldpath"
1974 - boost_failed_libs="$boost_failed_libs@$boost_lib@"
1976 -@@ -17719,13 +17966,14 @@ done
1981 - rm -f conftest.$ac_objext
1984 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5
1985 - $as_echo "$boost_cv_lib_system" >&6; }
1986 - case $boost_cv_lib_system in #(
1987 -- no) $as_echo "$as_me: failed program was:" >&5
1988 -+ (no) $as_echo "$as_me: failed program was:" >&5
1989 - sed 's/^/| /' conftest.$ac_ext >&5
1991 - as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5
1992 -@@ -17790,13 +18038,6 @@ fi
1994 - boost_save_CPPFLAGS=$CPPFLAGS
1995 - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
1996 --# Now let's try to find the library. The algorithm is as follows: first look
1997 --# for a given library name according to the user's PREFERRED-RT-OPT. For each
1998 --# library name, we prefer to use the ones that carry the tag (toolset name).
1999 --# Each library is searched through the various standard paths were Boost is
2000 --# usually installed. If we can't find the standard variants, we try to
2001 --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
2002 --# but there's -obviously- libboost_threads-mt.dylib).
2003 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost filesystem library" >&5
2004 - $as_echo_n "checking for the Boost filesystem library... " >&6; }
2005 - if ${boost_cv_lib_filesystem+:} false; then :
2006 -@@ -17804,19 +18045,19 @@ if ${boost_cv_lib_filesystem+:} false; t
2008 - boost_cv_lib_filesystem=no
2010 -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
2011 -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
2012 -- *) boost_mt=; boost_rtopt=;;
2013 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
2014 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
2015 -+ (*) boost_mt=; boost_rtopt=;;
2017 - if test $enable_static_boost = yes; then
2018 - boost_rtopt="s$boost_rtopt"
2020 - # Find the proper debug variant depending on what we've been asked to find.
2021 - case $boost_rtopt in #(
2022 -- *d*) boost_rt_d=$boost_rtopt;; #(
2023 -- *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
2024 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
2025 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
2026 - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
2027 -- *) boost_rt_d='-d';;
2028 -+ (*) boost_rt_d='-d';;
2030 - # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
2031 - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
2032 -@@ -17847,21 +18088,22 @@ fi
2033 - rm -f core conftest.err conftest.$ac_objext
2034 - ac_objext=$boost_save_ac_objext
2035 - boost_failed_libs=
2036 --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
2038 -+# Don't bother to ident the following nested for loops, only the 2
2039 -+# innermost ones matter.
2040 -+for boost_lib_ in filesystem; do
2041 - for boost_tag_ in -$boost_cv_lib_tag ''; do
2042 - for boost_ver_ in -$boost_cv_lib_version ''; do
2043 - for boost_mt_ in $boost_mt -mt ''; do
2044 - for boost_rtopt_ in $boost_rtopt '' -d; do
2045 - for boost_lib in \
2046 -- boost_filesystem$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
2047 -- boost_filesystem$boost_tag_$boost_rtopt_$boost_ver_ \
2048 -- boost_filesystem$boost_tag_$boost_mt_$boost_ver_ \
2049 -- boost_filesystem$boost_tag_$boost_ver_
2050 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
2051 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
2052 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
2053 -+ boost_$boost_lib_$boost_tag_$boost_ver_
2055 - # Avoid testing twice the same lib
2056 - case $boost_failed_libs in #(
2057 -- *@$boost_lib@*) continue;;
2058 -+ (*@$boost_lib@*) continue;;
2060 - # If with_boost is empty, we'll search in /lib first, which is not quite
2061 - # right so instead we'll try to a location based on where the headers are.
2062 -@@ -17871,14 +18113,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
2063 - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
2064 - "$with_boost" C:/Boost/lib /lib*
2066 -- test -e "$boost_ldpath" || continue
2067 -+ # Don't waste time with directories that don't exist.
2068 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
2071 - boost_save_LDFLAGS=$LDFLAGS
2072 - # Are we looking for a static library?
2073 - case $boost_ldpath:$boost_rtopt_ in #(
2074 -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
2075 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
2076 - boost_cv_lib_filesystem_LIBS="$boost_ldpath/lib$boost_lib.$libext"
2077 - test -e "$boost_cv_lib_filesystem_LIBS" || continue;; #(
2078 -- *) # No: use -lboost_foo to find the shared library.
2079 -+ (*) # No: use -lboost_foo to find the shared library.
2080 - boost_cv_lib_filesystem_LIBS="-l$boost_lib";;
2082 - boost_save_LIBS=$LIBS
2083 -@@ -17907,11 +18152,11 @@ $as_echo "$ac_try_echo"; } >&5
2085 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2086 - test $ac_status = 0; } && {
2087 -- test -z "$ac_cxx_werror_flag" ||
2088 -- test ! -s conftest.err
2089 -+ test -z "$ac_cxx_werror_flag" ||
2090 -+ test ! -s conftest.err
2091 - } && test -s conftest$ac_exeext && {
2092 -- test "$cross_compiling" = yes ||
2093 -- $as_executable_p conftest$ac_exeext
2094 -+ test "$cross_compiling" = yes ||
2095 -+ $as_executable_p conftest$ac_exeext
2097 - boost_cv_lib_filesystem=yes
2099 -@@ -17930,17 +18175,22 @@ rm -f core conftest.err conftest_ipa8_co
2100 - LDFLAGS=$boost_save_LDFLAGS
2101 - LIBS=$boost_save_LIBS
2102 - if test x"$boost_cv_lib_filesystem" = xyes; then
2103 -- # Check or used cached result of whether or not using -R or -rpath makes sense.
2104 -- # Some implementations of ld, such as for Mac OSX, require -rpath but
2105 -- # -R is the flag known to work on other systems.
2106 -- # https://github.com/tsuna/boost.m4/issues/19
2107 -+ # Check or used cached result of whether or not using -R or
2108 -+ # -rpath makes sense. Some implementations of ld, such as for
2109 -+ # Mac OSX, require -rpath but -R is the flag known to work on
2110 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
2111 - if ${boost_cv_rpath_link_ldflag+:} false; then :
2112 - $as_echo_n "(cached) " >&6
2114 -- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
2115 -- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2116 -- LIBS="$boost_save_LIBS $boost_cv_lib_filesystem_LIBS"
2117 -- rm -f conftest$ac_exeext
2118 -+ case $boost_ldpath in
2119 -+ '') # Nothing to do.
2120 -+ boost_cv_rpath_link_ldflag=
2121 -+ boost_rpath_link_ldflag_found=yes;;
2123 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
2124 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2125 -+ LIBS="$boost_save_LIBS $boost_cv_lib_filesystem_LIBS"
2126 -+ rm -f conftest$ac_exeext
2127 - boost_save_ac_ext=$ac_ext
2128 - boost_use_source=:
2129 - # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
2130 -@@ -17963,14 +18213,14 @@ $as_echo "$ac_try_echo"; } >&5
2132 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2133 - test $ac_status = 0; } && {
2134 -- test -z "$ac_cxx_werror_flag" ||
2135 -- test ! -s conftest.err
2136 -+ test -z "$ac_cxx_werror_flag" ||
2137 -+ test ! -s conftest.err
2138 - } && test -s conftest$ac_exeext && {
2139 -- test "$cross_compiling" = yes ||
2140 -- $as_executable_p conftest$ac_exeext
2141 -+ test "$cross_compiling" = yes ||
2142 -+ $as_executable_p conftest$ac_exeext
2144 - boost_rpath_link_ldflag_found=yes
2148 - if $boost_use_source; then
2149 - $as_echo "$as_me: failed program was:" >&5
2150 -@@ -17983,7 +18233,9 @@ ac_objext=$boost_save_ac_objext
2151 - ac_ext=$boost_save_ac_ext
2152 - rm -f core conftest.err conftest_ipa8_conftest.oo \
2153 - conftest$ac_exeext
2158 - if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
2159 - as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
2161 -@@ -17992,9 +18244,10 @@ fi
2165 -- boost_cv_lib_filesystem_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2166 -+ test x"$boost_ldpath" != x &&
2167 -+ boost_cv_lib_filesystem_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2168 - boost_cv_lib_filesystem_LDPATH="$boost_ldpath"
2172 - boost_failed_libs="$boost_failed_libs@$boost_lib@"
2174 -@@ -18004,13 +18257,14 @@ done
2179 - rm -f conftest.$ac_objext
2182 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_filesystem" >&5
2183 - $as_echo "$boost_cv_lib_filesystem" >&6; }
2184 - case $boost_cv_lib_filesystem in #(
2185 -- no) $as_echo "$as_me: failed program was:" >&5
2186 -+ (no) $as_echo "$as_me: failed program was:" >&5
2187 - sed 's/^/| /' conftest.$ac_ext >&5
2189 - as_fn_error $? "cannot find the flags to link with Boost filesystem" "$LINENO" 5
2190 -@@ -18029,13 +18283,298 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2193 - if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
2194 -- BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
2196 -+ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
2198 - LIBS=$boost_filesystem_save_LIBS
2199 - LDFLAGS=$boost_filesystem_save_LDFLAGS
2202 -+ if test x"$boost_cv_inc_path" = xno; then
2203 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
2204 -+$as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;}
2207 -+ac_cpp='$CXXCPP $CPPFLAGS'
2208 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2209 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2210 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2211 -+if test x"$boost_cv_inc_path" = xno; then
2212 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/system/error_code.hpp" >&5
2213 -+$as_echo "$as_me: Boost not available, not searching for boost/system/error_code.hpp" >&6;}
2216 -+ac_cpp='$CXXCPP $CPPFLAGS'
2217 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2218 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2219 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2220 -+boost_save_CPPFLAGS=$CPPFLAGS
2221 -+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
2222 -+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/system/error_code.hpp" "ac_cv_header_boost_system_error_code_hpp" "$ac_includes_default"
2223 -+if test "x$ac_cv_header_boost_system_error_code_hpp" = xyes; then :
2225 -+$as_echo "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h
2228 -+ as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5
2232 -+CPPFLAGS=$boost_save_CPPFLAGS
2234 -+ac_cpp='$CXXCPP $CPPFLAGS'
2235 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2236 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2237 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2240 -+boost_save_CPPFLAGS=$CPPFLAGS
2241 -+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
2242 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5
2243 -+$as_echo_n "checking for the Boost system library... " >&6; }
2244 -+if ${boost_cv_lib_system+:} false; then :
2245 -+ $as_echo_n "(cached) " >&6
2247 -+ boost_cv_lib_system=no
2249 -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
2250 -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
2251 -+ (*) boost_mt=; boost_rtopt=;;
2253 -+ if test $enable_static_boost = yes; then
2254 -+ boost_rtopt="s$boost_rtopt"
2256 -+ # Find the proper debug variant depending on what we've been asked to find.
2257 -+ case $boost_rtopt in #(
2258 -+ (*d*) boost_rt_d=$boost_rtopt;; #(
2259 -+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
2260 -+ boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
2261 -+ (*) boost_rt_d='-d';;
2263 -+ # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
2264 -+ test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
2265 -+ $boost_guess_use_mt && boost_mt=-mt
2266 -+ # Look for the abs path the static archive.
2267 -+ # $libext is computed by Libtool but let's make sure it's non empty.
2268 -+ test -z "$libext" &&
2269 -+ as_fn_error $? "the libext variable is empty, did you invoke Libtool?" "$LINENO" 5
2270 -+ boost_save_ac_objext=$ac_objext
2271 -+ # Generate the test file.
2272 -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2273 -+/* end confdefs.h. */
2274 -+#include <boost/system/error_code.hpp>
2279 -+boost::system::error_code e; e.clear();
2284 -+ if ac_fn_cxx_try_compile "$LINENO"; then :
2285 -+ ac_objext=do_not_rm_me_plz
2287 -+ as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5
2289 -+rm -f core conftest.err conftest.$ac_objext
2290 -+ ac_objext=$boost_save_ac_objext
2291 -+ boost_failed_libs=
2292 -+# Don't bother to ident the following nested for loops, only the 2
2293 -+# innermost ones matter.
2294 -+for boost_lib_ in system; do
2295 -+for boost_tag_ in -$boost_cv_lib_tag ''; do
2296 -+for boost_ver_ in -$boost_cv_lib_version ''; do
2297 -+for boost_mt_ in $boost_mt -mt ''; do
2298 -+for boost_rtopt_ in $boost_rtopt '' -d; do
2299 -+ for boost_lib in \
2300 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
2301 -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
2302 -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
2303 -+ boost_$boost_lib_$boost_tag_$boost_ver_
2305 -+ # Avoid testing twice the same lib
2306 -+ case $boost_failed_libs in #(
2307 -+ (*@$boost_lib@*) continue;;
2309 -+ # If with_boost is empty, we'll search in /lib first, which is not quite
2310 -+ # right so instead we'll try to a location based on where the headers are.
2311 -+ boost_tmp_lib=$with_boost
2312 -+ test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
2313 -+ for boost_ldpath in "$boost_tmp_lib/lib" '' \
2314 -+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
2315 -+ "$with_boost" C:/Boost/lib /lib*
2317 -+ # Don't waste time with directories that don't exist.
2318 -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
2321 -+ boost_save_LDFLAGS=$LDFLAGS
2322 -+ # Are we looking for a static library?
2323 -+ case $boost_ldpath:$boost_rtopt_ in #(
2324 -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
2325 -+ boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext"
2326 -+ test -e "$boost_cv_lib_system_LIBS" || continue;; #(
2327 -+ (*) # No: use -lboost_foo to find the shared library.
2328 -+ boost_cv_lib_system_LIBS="-l$boost_lib";;
2330 -+ boost_save_LIBS=$LIBS
2331 -+ LIBS="$boost_cv_lib_system_LIBS $LIBS"
2332 -+ test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
2333 -+ rm -f conftest$ac_exeext
2334 -+boost_save_ac_ext=$ac_ext
2335 -+boost_use_source=:
2336 -+# If we already have a .o, re-use it. We change $ac_ext so that $ac_link
2337 -+# tries to link the existing object file instead of compiling from source.
2338 -+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
2339 -+ $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
2340 -+if { { ac_try="$ac_link"
2341 -+case "(($ac_try" in
2342 -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2343 -+ *) ac_try_echo=$ac_try;;
2345 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2346 -+$as_echo "$ac_try_echo"; } >&5
2347 -+ (eval "$ac_link") 2>conftest.err
2349 -+ if test -s conftest.err; then
2350 -+ grep -v '^ *+' conftest.err >conftest.er1
2351 -+ cat conftest.er1 >&5
2352 -+ mv -f conftest.er1 conftest.err
2354 -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2355 -+ test $ac_status = 0; } && {
2356 -+ test -z "$ac_cxx_werror_flag" ||
2357 -+ test ! -s conftest.err
2358 -+ } && test -s conftest$ac_exeext && {
2359 -+ test "$cross_compiling" = yes ||
2360 -+ $as_executable_p conftest$ac_exeext
2362 -+ boost_cv_lib_system=yes
2364 -+ if $boost_use_source; then
2365 -+ $as_echo "$as_me: failed program was:" >&5
2366 -+sed 's/^/| /' conftest.$ac_ext >&5
2369 -+ boost_cv_lib_system=no
2371 -+ac_objext=$boost_save_ac_objext
2372 -+ac_ext=$boost_save_ac_ext
2373 -+rm -f core conftest.err conftest_ipa8_conftest.oo \
2374 -+ conftest$ac_exeext
2375 -+ ac_objext=$boost_save_ac_objext
2376 -+ LDFLAGS=$boost_save_LDFLAGS
2377 -+ LIBS=$boost_save_LIBS
2378 -+ if test x"$boost_cv_lib_system" = xyes; then
2379 -+ # Check or used cached result of whether or not using -R or
2380 -+ # -rpath makes sense. Some implementations of ld, such as for
2381 -+ # Mac OSX, require -rpath but -R is the flag known to work on
2382 -+ # other systems. https://github.com/tsuna/boost.m4/issues/19
2383 -+ if ${boost_cv_rpath_link_ldflag+:} false; then :
2384 -+ $as_echo_n "(cached) " >&6
2386 -+ case $boost_ldpath in
2387 -+ '') # Nothing to do.
2388 -+ boost_cv_rpath_link_ldflag=
2389 -+ boost_rpath_link_ldflag_found=yes;;
2391 -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
2392 -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2393 -+ LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS"
2394 -+ rm -f conftest$ac_exeext
2395 -+boost_save_ac_ext=$ac_ext
2396 -+boost_use_source=:
2397 -+# If we already have a .o, re-use it. We change $ac_ext so that $ac_link
2398 -+# tries to link the existing object file instead of compiling from source.
2399 -+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
2400 -+ $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
2401 -+if { { ac_try="$ac_link"
2402 -+case "(($ac_try" in
2403 -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2404 -+ *) ac_try_echo=$ac_try;;
2406 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2407 -+$as_echo "$ac_try_echo"; } >&5
2408 -+ (eval "$ac_link") 2>conftest.err
2410 -+ if test -s conftest.err; then
2411 -+ grep -v '^ *+' conftest.err >conftest.er1
2412 -+ cat conftest.er1 >&5
2413 -+ mv -f conftest.er1 conftest.err
2415 -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2416 -+ test $ac_status = 0; } && {
2417 -+ test -z "$ac_cxx_werror_flag" ||
2418 -+ test ! -s conftest.err
2419 -+ } && test -s conftest$ac_exeext && {
2420 -+ test "$cross_compiling" = yes ||
2421 -+ $as_executable_p conftest$ac_exeext
2423 -+ boost_rpath_link_ldflag_found=yes
2426 -+ if $boost_use_source; then
2427 -+ $as_echo "$as_me: failed program was:" >&5
2428 -+sed 's/^/| /' conftest.$ac_ext >&5
2431 -+ boost_rpath_link_ldflag_found=no
2433 -+ac_objext=$boost_save_ac_objext
2434 -+ac_ext=$boost_save_ac_ext
2435 -+rm -f core conftest.err conftest_ipa8_conftest.oo \
2436 -+ conftest$ac_exeext
2440 -+ if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
2441 -+ as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
2443 -+ LDFLAGS=$boost_save_LDFLAGS
2444 -+ LIBS=$boost_save_LIBS
2448 -+ test x"$boost_ldpath" != x &&
2449 -+ boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
2450 -+ boost_cv_lib_system_LDPATH="$boost_ldpath"
2453 -+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
2462 -+rm -f conftest.$ac_objext
2465 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5
2466 -+$as_echo "$boost_cv_lib_system" >&6; }
2467 -+case $boost_cv_lib_system in #(
2468 -+ (no) $as_echo "$as_me: failed program was:" >&5
2469 -+sed 's/^/| /' conftest.$ac_ext >&5
2471 -+ as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5
2474 -+BOOST_SYSTEM_LDFLAGS=$boost_cv_lib_system_LDFLAGS
2475 -+BOOST_SYSTEM_LDPATH=$boost_cv_lib_system_LDPATH
2476 -+BOOST_LDPATH=$boost_cv_lib_system_LDPATH
2477 -+BOOST_SYSTEM_LIBS=$boost_cv_lib_system_LIBS
2478 -+CPPFLAGS=$boost_save_CPPFLAGS
2480 -+ac_cpp='$CXXCPP $CPPFLAGS'
2481 -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2482 -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2483 -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2491 -@@ -18051,12 +18590,12 @@ if test -n "$MDDS_CFLAGS"; then
2492 - pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS"
2493 - elif test -n "$PKG_CONFIG"; then
2494 - if test -n "$PKG_CONFIG" && \
2495 -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.8.0\""; } >&5
2496 -- ($PKG_CONFIG --exists --print-errors "mdds >= 0.8.0") 2>&5
2497 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5
2498 -+ ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5
2500 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2501 - test $ac_status = 0; }; then
2502 -- pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds >= 0.8.0" 2>/dev/null`
2503 -+ pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds >= 0.11.0" 2>/dev/null`
2504 - test "x$?" != "x0" && pkg_failed=yes
2507 -@@ -18068,12 +18607,12 @@ if test -n "$MDDS_LIBS"; then
2508 - pkg_cv_MDDS_LIBS="$MDDS_LIBS"
2509 - elif test -n "$PKG_CONFIG"; then
2510 - if test -n "$PKG_CONFIG" && \
2511 -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.8.0\""; } >&5
2512 -- ($PKG_CONFIG --exists --print-errors "mdds >= 0.8.0") 2>&5
2513 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5
2514 -+ ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5
2516 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2517 - test $ac_status = 0; }; then
2518 -- pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds >= 0.8.0" 2>/dev/null`
2519 -+ pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds >= 0.11.0" 2>/dev/null`
2520 - test "x$?" != "x0" && pkg_failed=yes
2523 -@@ -18094,14 +18633,14 @@ else
2524 - _pkg_short_errors_supported=no
2526 - if test $_pkg_short_errors_supported = yes; then
2527 -- MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds >= 0.8.0" 2>&1`
2528 -+ MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1`
2530 -- MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds >= 0.8.0" 2>&1`
2531 -+ MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1`
2533 - # Put the nasty error message in config.log where it belongs
2534 - echo "$MDDS_PKG_ERRORS" >&5
2536 -- as_fn_error $? "Package requirements (mdds >= 0.8.0) were not met:
2537 -+ as_fn_error $? "Package requirements (mdds >= 0.11.0) were not met:
2541 -@@ -19998,7 +20537,7 @@ $as_echo "$as_me: executing $ac_file com
2543 - case $ac_file$ac_mode in
2544 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
2545 -- # Autoconf 2.62 quotes --file arguments for eval, but not when files
2546 -+ # Older Autoconf quotes --file arguments for eval, but not when files
2547 - # are listed without --file. Let's play safe and only enable the eval
2548 - # if we detect the quoting.
2549 - case $CONFIG_FILES in
2550 -@@ -20049,7 +20588,7 @@ $as_echo X"$mf" |
2551 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2552 - test -z "$DEPDIR" && continue
2553 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
2554 -- test -z "am__include" && continue
2555 -+ test -z "$am__include" && continue
2556 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2557 - # Find all dependency output files, they are included files with
2558 - # $(DEPDIR) in their names. We invoke sed twice because it is the
2559 diff --git a/external/liborcus/visibility.patch b/external/liborcus/visibility.patch
2560 deleted file mode 100644
2561 index a5af639..0000000
2562 --- a/external/liborcus/visibility.patch
2567 -@@ -3211,7 +3211,7 @@
2568 - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2569 - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2571 --CXXFLAGS="$CXXFLAGS -O2 -fvisibility=hidden -Wall"
2572 -+CXXFLAGS="$CXXFLAGS -O2 -Wall"
2574 - # ===========================
2575 - # Find required base packages
2576 diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
2577 index ce19c0b..e418ed8 100644
2578 --- a/sc/source/filter/html/htmlpars.cxx
2579 +++ b/sc/source/filter/html/htmlpars.cxx
2580 @@ -3170,6 +3170,34 @@ public:
2581 maPropName = MemStr();
2582 maPropValue = MemStr();
2586 + void simple_selector_type(const char* /*p*/, size_t /*n*/) {}
2588 + void simple_selector_class(const char* /*p*/, size_t /*n*/) {}
2590 + void simple_selector_pseudo_element(orcus::css::pseudo_element_t /*pe*/) {}
2592 + void simple_selector_pseudo_class(orcus::css::pseudo_class_t /*pc*/) {}
2594 + void simple_selector_id(const char* /*p*/, size_t /*n*/) {}
2596 + void end_simple_selector() {}
2598 + void end_selector() {}
2600 + void combinator(orcus::css::combinator_t /*combinator*/) {}
2602 + void rgb(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ ) {}
2604 + void rgba(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ , double /*alpha*/ ) {}
2606 + void hsl(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ ) {}
2608 + void hsla(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ , double /*alpha*/ ) {}
2610 + void url(const char* /*p*/, size_t /*n*/) {}
2615 @@ -3183,7 +3211,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString& rStrm)
2619 - catch (const orcus::css_parse_error&)
2620 + catch (const orcus::css::parse_error&)
2622 // TODO: Parsing of CSS failed. Do nothing for now.
2624 diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
2625 index a778310..633b43d 100644
2626 --- a/sc/source/filter/inc/orcusinterface.hxx
2627 +++ b/sc/source/filter/inc/orcusinterface.hxx
2628 @@ -43,6 +43,9 @@ public:
2629 ScOrcusGlobalSettings(ScDocumentImport& rDoc);
2631 virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE;
2633 + virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE;
2634 + virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE;
2637 class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings
2638 @@ -120,9 +123,12 @@ public:
2639 orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE;
2641 virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE;
2642 + virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start,
2643 + orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE;
2645 virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE;
2646 virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE;
2647 + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) SAL_OVERRIDE;
2649 virtual void set_shared_formula(
2650 orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex,
2651 @@ -203,6 +209,10 @@ public:
2652 virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE;
2653 virtual size_t commit_cell_xf() SAL_OVERRIDE;
2656 + virtual void set_dxf_count(size_t count) SAL_OVERRIDE;
2657 + virtual size_t commit_dxf() SAL_OVERRIDE;
2659 // xf (cell format) - used both by cell xf and cell style xf.
2661 virtual void set_xf_number_format(size_t index) SAL_OVERRIDE;
2662 diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
2663 index 3735f28..82b8f9e 100644
2664 --- a/sc/source/filter/orcus/interface.cxx
2665 +++ b/sc/source/filter/orcus/interface.cxx
2666 @@ -35,6 +35,15 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
2667 mrDoc.setOriginDate(year, month, day);
2670 +void ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t /*grammar*/)
2674 +orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
2676 + return orcus::spreadsheet::formula_grammar_unknown;
2679 ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) :
2680 maPos(rPos), mnIndex(nIndex) {}
2682 @@ -263,6 +272,11 @@ void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t /*xf_
2686 +void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/,
2687 + os::row_t /*row_end*/, os::col_t /*col_end*/, size_t /*xf_index*/)
2693 formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t grammar )
2694 @@ -270,16 +284,18 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
2695 formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
2698 - case orcus::spreadsheet::ods:
2699 + case orcus::spreadsheet::formula_grammar_ods:
2700 eGrammar = formula::FormulaGrammar::GRAM_ODFF;
2702 - case orcus::spreadsheet::xlsx_2007:
2703 - case orcus::spreadsheet::xlsx_2010:
2704 + case orcus::spreadsheet::formula_grammar_xlsx_2007:
2705 + case orcus::spreadsheet::formula_grammar_xlsx_2010:
2706 eGrammar = formula::FormulaGrammar::GRAM_OOXML;
2708 - case orcus::spreadsheet::gnumeric:
2709 + case orcus::spreadsheet::formula_grammar_gnumeric:
2710 eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
2712 + case orcus::spreadsheet::formula_grammar_unknown:
2717 @@ -309,6 +325,19 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char*
2718 pCell->SetHybridString(mrDoc.getDoc().GetSharedStringPool().intern(aResult));
2721 +void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val*/)
2723 + ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab));
2726 + SAL_WARN("sc", "trying to set formula result for non formula \
2727 + cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab);
2734 void ScOrcusSheet::set_shared_formula(
2735 os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex,
2736 const char* p_formula, size_t n_formula)
2737 @@ -577,6 +606,17 @@ size_t ScOrcusStyles::commit_cell_xf()
2743 +void ScOrcusStyles::set_dxf_count(size_t /*n*/)
2747 +size_t ScOrcusStyles::commit_dxf()
2752 // xf (cell format) - used both by cell xf and cell style xf.
2754 void ScOrcusStyles::set_xf_number_format(size_t /*index*/)