From 6fa818c04cd6b011a281ab02ab861e84a94ee549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 22 Jan 2016 14:38:59 +0000 Subject: [PATCH] rerun autoconf after remove BOOST_SYSTEM Change-Id: Id9afe7150ad721ba1d728cbb3e9b496d15f0896f --- external/liborcus/unusedheader.patch.0 | 2630 ++++++++++++++++++++++++++++++++ 1 file changed, 2630 insertions(+) diff --git a/external/liborcus/unusedheader.patch.0 b/external/liborcus/unusedheader.patch.0 index 4f7a77b..54f2fe6 100644 --- a/external/liborcus/unusedheader.patch.0 +++ b/external/liborcus/unusedheader.patch.0 @@ -9,3 +9,2633 @@ using namespace std; namespace orcus { +--- ./configure.orig 2016-01-22 14:33:55.601487405 +0000 ++++ ./configure 2016-01-22 14:35:45.219928835 +0000 +@@ -640,10 +640,14 @@ + BOOST_FILESYSTEM_LIBS + BOOST_FILESYSTEM_LDPATH + BOOST_FILESYSTEM_LDFLAGS ++BOOST_SYSTEM_LIBS ++BOOST_SYSTEM_LDPATH ++BOOST_SYSTEM_LDFLAGS + BOOST_PROGRAM_OPTIONS_LIBS + BOOST_PROGRAM_OPTIONS_LDPATH + BOOST_PROGRAM_OPTIONS_LDFLAGS + BOOST_IOSTREAMS_LIBS ++BOOST_LDPATH + BOOST_IOSTREAMS_LDPATH + BOOST_IOSTREAMS_LDFLAGS + WITH_TOOLS_FALSE +@@ -660,10 +664,6 @@ + ZLIB_CFLAGS + HAVE_STATIC_LIB_FALSE + HAVE_STATIC_LIB_TRUE +-BOOST_SYSTEM_LIBS +-BOOST_LDPATH +-BOOST_SYSTEM_LDPATH +-BOOST_SYSTEM_LDFLAGS + BOOST_CPPFLAGS + DISTCHECK_CONFIGURE_FLAGS + BOOST_ROOT +@@ -807,14 +807,13 @@ + with_sysroot + enable_libtool_lock + with_boost +-enable_static_boost +-enable_werror + enable_debug + with_tools + with_ods_filter + with_xlsx_filter + with_xls_xml_filter + with_gnumeric_filter ++enable_static_boost + enable_spreadsheet_model + ' + ac_precious_vars='build_alias +@@ -1469,10 +1468,9 @@ + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-debug Build with debug features in mind.] + --enable-static-boost Prefer the static boost libraries over the shared + ones [no] +- --enable-werror Treat all warnings as errors, useful for development +- --enable-debug Build with debug features in mind.] + --disable-spreadsheet-model + Disable the spreadsheet model implementation in + orcus. Note that the spreadsheet-specific command +@@ -2592,7 +2590,7 @@ + + ac_config_headers="$ac_config_headers config.h" + +-am__api_version='1.14' ++am__api_version='1.12' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2805,8 +2803,8 @@ + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --is-lightweight"; then +- am_missing_run="$MISSING " ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " + else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +@@ -3046,45 +3044,6 @@ + fi + rmdir .tst 2>/dev/null + +-# Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then : +- enableval=$enable_silent_rules; +-fi +- +-case $enable_silent_rules in # ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=1;; +-esac +-am_make=${MAKE-make} +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +-$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +-if ${am_cv_make_support_nested_variables+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if $as_echo 'TRUE=$(BAR$(V)) +-BAR0=false +-BAR1=true +-V=1 +-am__doit: +- @$(TRUE) +-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then +- am_cv_make_support_nested_variables=yes +-else +- am_cv_make_support_nested_variables=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +-$as_echo "$am_cv_make_support_nested_variables" >&6; } +-if test $am_cv_make_support_nested_variables = yes; then +- AM_V='$(V)' +- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +-else +- AM_V=$AM_DEFAULT_VERBOSITY +- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +-fi +-AM_BACKSLASH='\' +- + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." +@@ -3135,70 +3094,19 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-# For better backward compatibility. To be removed once Automake 1.9.x +-# dies out for good. For more background, see: +-# +-# +-mkdir_p='$(MKDIR_P)' +- ++mkdir_p="$MKDIR_P" + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. Yes, it's still used + # in the wild :-( We should find a proper way to deprecate it ... + AMTAR='$${TAR-tar}' + +- +-# We'll loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar pax cpio none' +- + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + +- +-# POSIX will say in a future version that running "rm -f" with no argument +-# is OK; and we want to be able to make that assumption in our Makefile +-# recipes. So use an aggressive probe to check that the usage we want is +-# actually supported "in the wild" to an acceptable degree. +-# See automake bug#10828. +-# To make any issue more visible, cause the running configure to be aborted +-# by default if the 'rm' program in use doesn't match our expectations; the +-# user can still override this though. +-if rm -f && rm -fr && rm -rf; then : OK; else +- cat >&2 <<'END' +-Oops! +- +-Your 'rm' program seems unable to run without file operands specified +-on the command line, even when the '-f' option is present. This is contrary +-to the behaviour of most rm programs out there, and not conforming with +-the upcoming POSIX standard: +- +-Please tell bug-automake@gnu.org about your system, including the value +-of your $PATH and any error possibly output before this message. This +-can help us improve future automake versions. +- +-END +- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then +- echo 'Configuration will proceed anyway, since you have set the' >&2 +- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 +- echo >&2 +- else +- cat >&2 <<'END' +-Aborting the configuration process, to ensure you take notice of the issue. +- +-You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: . +- +-If you want to complete the configuration process using your problematic +-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +-to "yes", and re-run configure. +- +-END +- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 +- fi +-fi + # Check whether --enable-silent-rules was given. + if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +@@ -4101,65 +4009,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +-if ${am_cv_prog_cc_c_o+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +- # Make sure it works both with $CC and with simple cc. +- # Following AC_PROG_CC_C_O, we do the test twice because some +- # compilers refuse to overwrite an existing .o file with -o, +- # though they will create one. +- am_cv_prog_cc_c_o=yes +- for am_i in 1 2; do +- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 +- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } \ +- && test -f conftest2.$ac_objext; then +- : OK +- else +- am_cv_prog_cc_c_o=no +- break +- fi +- done +- rm -f core conftest* +- unset am_i +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +-$as_echo "$am_cv_prog_cc_c_o" >&6; } +-if test "$am_cv_prog_cc_c_o" != yes; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- + depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +@@ -7222,7 +7071,7 @@ + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +@@ -7240,10 +7089,7 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- powerpc64le-*linux*) +- LD="${LD-ld} -m elf32lppclinux" +- ;; +- powerpc64-*linux*) ++ ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -7262,10 +7108,7 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- powerpcle-*linux*) +- LD="${LD-ld} -m elf64lppc" +- ;; +- powerpc-*linux*) ++ ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +@@ -11288,14 +11131,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -15123,14 +14962,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -16203,7 +16038,7 @@ + # ====================== + # Set required ixion api + # ====================== +-IXION_REQUIRED_API_VERSION=0.10 ++IXION_REQUIRED_API_VERSION=0.8 + + + # ============= +@@ -16212,7 +16047,7 @@ + ORCUS_API_VERSION=0.8 + + +-echo "$as_me: this is boost.m4 serial 24" >&5 ++echo "$as_me: this is boost.m4 serial 18" >&5 + boost_save_IFS=$IFS + boost_version_req=1.36 + IFS=. +@@ -16356,30 +16191,17 @@ + if ${boost_cv_lib_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + boost-lib-version = BOOST_LIB_VERSION + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- grep -v '#' | +- grep -Ev '^(conftest.cpp| *command-line arguments :)' | + tr -d '\r' | +- tr -s '\n' ' ' | +- $SED -n -e "/^ *boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then : ++ $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then : + boost_cv_lib_version=`cat conftest.i` + fi + rm -rf conftest* +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5 +@@ -16388,536 +16210,40 @@ + boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` + case $boost_major_version in #( + '' | *[!0-9]*) +- as_fn_error $? "invalid value: boost_major_version='$boost_major_version'" "$LINENO" 5 ++ as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5 + ;; + esac + fi + CPPFLAGS=$boost_save_CPPFLAGS + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the toolset name used by Boost for $CXX" >&5 +-$as_echo_n "checking for the toolset name used by Boost for $CXX... " >&6; } +-if ${boost_cv_lib_tag+:} false; then : +- $as_echo_n "(cached) " >&6 ++ ++# ========================================================= ++# Determine if we are going to build static lib (for MinGW) ++# ========================================================= ++ if test "$enable_shared" = no -a "$enable_static" = yes; then ++ HAVE_STATIC_LIB_TRUE= ++ HAVE_STATIC_LIB_FALSE='#' + else +- boost_cv_lib_tag=unknown +-if test x$boost_cv_inc_path != xno; then +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- # The following tests are mostly inspired by boost/config/auto_link.hpp +- # The list is sorted to most recent/common to oldest compiler (in order +- # to increase the likelihood of finding the right compiler with the +- # least number of compilation attempt). +- # Beware that some tests are sensible to the order (for instance, we must +- # look for MinGW before looking for GCC3). +- # I used one compilation test per compiler with a #error to recognize +- # each compiler so that it works even when cross-compiling (let me know +- # if you know a better approach). +- # Known missing tags (known from Boost's tools/build/v2/tools/common.jam): +- # como, edg, kcc, bck, mp, sw, tru, xlc +- # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines +- # the same defines as GCC's). +- for i in \ +- "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw50" \ +- "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc50" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw410" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC @ gcc410" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw49" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC @ gcc49" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw48" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC @ gcc48" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw47" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC @ gcc47" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw46" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC @ gcc46" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw45" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC @ gcc45" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw44" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc44" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw43" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw42" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc42" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw41" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc41" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC && \ +- (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw40" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc40" \ +- "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ +- && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +- || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \ +- "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc34" \ +- "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc33" \ +- "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \ +- "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \ +- "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc32" \ +- "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \ +- "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc31" \ +- "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc30" \ +- "defined __BORLANDC__ @ bcb" \ +- "defined __ICC && (defined __unix || defined ) @ il" \ +- "defined __ICL @ iw" \ +- "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ +- "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \ +- "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ +- "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ +- "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \ +- "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8" +- do +- boost_tag_test=`expr "X$i" : 'X\([^@]*\) @ '` +- boost_tag=`expr "X$i" : 'X[^@]* @ \(.*\)'` +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ ++ HAVE_STATIC_LIB_TRUE='#' ++ HAVE_STATIC_LIB_FALSE= ++fi + +-#if $boost_tag_test +-/* OK */ +-#else +-# error $boost_tag_test +-#endif + +-int +-main () +-{ ++# ===== ++# Debug ++# ===== ++# Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then : ++ enableval=$enable_debug; enable_debug="$enableval" ++else ++ enable_debug=no + +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- boost_cv_lib_tag=$boost_tag; break +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- case $boost_cv_lib_tag in #( +- # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed +- # to "gcc41" for instance. +- *-gcc | *'-gcc ') :;; #( Don't re-add -gcc: it's already in there. +- gcc*) +- boost_tag_x= +- case $host_os in #( +- darwin*) +- if test $boost_major_version -ge 136; then +- # The `x' added in r46793 of Boost. +- boost_tag_x=x +- fi;; +- esac +- # We can specify multiple tags in this variable because it's used by +- # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ... +- boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc" +- ;; #( +- unknown) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not figure out which toolset name to use for $CXX" >&5 +-$as_echo "$as_me: WARNING: could not figure out which toolset name to use for $CXX" >&2;} +- boost_cv_lib_tag= +- ;; +- esac + fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_tag" >&5 +-$as_echo "$boost_cv_lib_tag" >&6; } +-# Check whether --enable-static-boost was given. +-if test "${enable_static_boost+set}" = set; then : +- enableval=$enable_static_boost; enable_static_boost=yes +-else +- enable_static_boost=no +-fi +- +-# Check whether we do better use `mt' even though we weren't ask to. +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#if defined _REENTRANT || defined _MT || defined __MT__ +-/* use -mt */ +-#else +-# error MT not needed +-#endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- boost_guess_use_mt=: +-else +- boost_guess_use_mt=false +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5 +-$as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;} +-else +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/system/error_code.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/system/error_code.hpp" >&6;} +-else +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-boost_save_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/system/error_code.hpp" "ac_cv_header_boost_system_error_code_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_system_error_code_hpp" = xyes; then : +- +-$as_echo "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h +- +-else +- as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 +-fi +- +- +-CPPFLAGS=$boost_save_CPPFLAGS +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-fi +- +-boost_save_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5 +-$as_echo_n "checking for the Boost system library... " >&6; } +-if ${boost_cv_lib_system+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- boost_cv_lib_system=no +- case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; +- esac +- if test $enable_static_boost = yes; then +- boost_rtopt="s$boost_rtopt" +- fi +- # Find the proper debug variant depending on what we've been asked to find. +- case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') +- boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; +- esac +- # If the PREFERRED-RT-OPT are not empty, prepend a `-'. +- test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +- $boost_guess_use_mt && boost_mt=-mt +- # Look for the abs path the static archive. +- # $libext is computed by Libtool but let's make sure it's non empty. +- test -z "$libext" && +- as_fn_error $? "the libext variable is empty, did you invoke Libtool?" "$LINENO" 5 +- boost_save_ac_objext=$ac_objext +- # Generate the test file. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-boost::system::error_code e; e.clear(); +- ; +- return 0; +-} +-_ACEOF +- if ac_fn_cxx_try_compile "$LINENO"; then : +- ac_objext=do_not_rm_me_plz +-else +- as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5 +-fi +-rm -f core conftest.err conftest.$ac_objext +- ac_objext=$boost_save_ac_objext +- boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in system; do +-for boost_tag_ in -$boost_cv_lib_tag ''; do +-for boost_ver_ in -$boost_cv_lib_version ''; do +-for boost_mt_ in $boost_mt -mt ''; do +-for boost_rtopt_ in $boost_rtopt '' -d; do +- for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ +- do +- # Avoid testing twice the same lib +- case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; +- esac +- # If with_boost is empty, we'll search in /lib first, which is not quite +- # right so instead we'll try to a location based on where the headers are. +- boost_tmp_lib=$with_boost +- test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include} +- for boost_ldpath in "$boost_tmp_lib/lib" '' \ +- /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ +- "$with_boost" C:/Boost/lib /lib* +- do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi +- boost_save_LDFLAGS=$LDFLAGS +- # Are we looking for a static library? +- case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) +- boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext" +- test -e "$boost_cv_lib_system_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. +- boost_cv_lib_system_LIBS="-l$boost_lib";; +- esac +- boost_save_LIBS=$LIBS +- LIBS="$boost_cv_lib_system_LIBS $LIBS" +- test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" +- rm -f conftest$ac_exeext +-boost_save_ac_ext=$ac_ext +-boost_use_source=: +-# If we already have a .o, re-use it. We change $ac_ext so that $ac_link +-# tries to link the existing object file instead of compiling from source. +-test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && +- $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5 +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext +- }; then : +- boost_cv_lib_system=yes +-else +- if $boost_use_source; then +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- fi +- boost_cv_lib_system=no +-fi +-ac_objext=$boost_save_ac_objext +-ac_ext=$boost_save_ac_ext +-rm -f core conftest.err conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- ac_objext=$boost_save_ac_objext +- LDFLAGS=$boost_save_LDFLAGS +- LIBS=$boost_save_LIBS +- if test x"$boost_cv_lib_system" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 +- if ${boost_cv_rpath_link_ldflag+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS" +- rm -f conftest$ac_exeext +-boost_save_ac_ext=$ac_ext +-boost_use_source=: +-# If we already have a .o, re-use it. We change $ac_ext so that $ac_link +-# tries to link the existing object file instead of compiling from source. +-test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && +- $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5 +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext +- }; then : +- boost_rpath_link_ldflag_found=yes +- break +-else +- if $boost_use_source; then +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- fi +- boost_rpath_link_ldflag_found=no +-fi +-ac_objext=$boost_save_ac_objext +-ac_ext=$boost_save_ac_ext +-rm -f core conftest.err conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- done +- ;; +- esac +- if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : +- as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 +-fi +- LDFLAGS=$boost_save_LDFLAGS +- LIBS=$boost_save_LIBS +- +-fi +- +- test x"$boost_ldpath" != x && +- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- boost_cv_lib_system_LDPATH="$boost_ldpath" +- break 7 +- else +- boost_failed_libs="$boost_failed_libs@$boost_lib@" +- fi +- done +- done +-done +-done +-done +-done +-done # boost_lib_ +-rm -f conftest.$ac_objext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5 +-$as_echo "$boost_cv_lib_system" >&6; } +-case $boost_cv_lib_system in #( +- (no) $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5 +- ;; +-esac +-BOOST_SYSTEM_LDFLAGS=$boost_cv_lib_system_LDFLAGS +-BOOST_SYSTEM_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_SYSTEM_LIBS=$boost_cv_lib_system_LIBS +-CPPFLAGS=$boost_save_CPPFLAGS +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-fi +- +- +- +- +-# ============== +-# Werror support +-# ============== +-# Check whether --enable-werror was given. +-if test "${enable_werror+set}" = set; then : +- enableval=$enable_werror; enable_werror="$enableval" +-else +- enable_werror=no +- +-fi +- +-if test x"$enable_werror" == "xyes"; then : +- +- CXXFLAGS="$CXXFLAGS -Werror" +- +-fi +- +-# ========================================================= +-# Determine if we are going to build static lib (for MinGW) +-# ========================================================= +- if test "$enable_shared" = no -a "$enable_static" = yes; then +- HAVE_STATIC_LIB_TRUE= +- HAVE_STATIC_LIB_FALSE='#' +-else +- HAVE_STATIC_LIB_TRUE='#' +- HAVE_STATIC_LIB_FALSE= +-fi +- +- +-# ===== +-# Debug +-# ===== +-# Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then : +- enableval=$enable_debug; enable_debug="$enableval" +-else +- enable_debug=no +- +-fi +- +-if test "x$enable_debug" != "xno"; then : +- +- CXXFLAGS="$CXXFLAGS -g" +- ++ ++if test "x$enable_debug" != "xno"; then : ++ ++ CXXFLAGS="$CXXFLAGS -g" ++ + else + + +@@ -17123,7 +16449,151 @@ + WITH_TOOLS_TRUE='#' + WITH_TOOLS_FALSE= + fi +- ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the toolset name used by Boost for $CXX" >&5 ++$as_echo_n "checking for the toolset name used by Boost for $CXX... " >&6; } ++if ${boost_cv_lib_tag+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ boost_cv_lib_tag=unknown ++if test x$boost_cv_inc_path != xno; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ # The following tests are mostly inspired by boost/config/auto_link.hpp ++ # The list is sorted to most recent/common to oldest compiler (in order ++ # to increase the likelihood of finding the right compiler with the ++ # least number of compilation attempt). ++ # Beware that some tests are sensible to the order (for instance, we must ++ # look for MinGW before looking for GCC3). ++ # I used one compilation test per compiler with a #error to recognize ++ # each compiler so that it works even when cross-compiling (let me know ++ # if you know a better approach). ++ # Known missing tags (known from Boost's tools/build/v2/tools/common.jam): ++ # como, edg, kcc, bck, mp, sw, tru, xlc ++ # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines ++ # the same defines as GCC's). ++ for i in \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC @ gcc48" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC @ gcc47" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC @ gcc46" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC @ gcc45" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc44" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc42" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc41" \ ++ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc40" \ ++ "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ ++ && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ ++ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \ ++ "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc34" \ ++ "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc33" \ ++ "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \ ++ "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \ ++ "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc32" \ ++ "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \ ++ "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc31" \ ++ "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc30" \ ++ "defined __BORLANDC__ @ bcb" \ ++ "defined __ICC && (defined __unix || defined ) @ il" \ ++ "defined __ICL @ iw" \ ++ "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ ++ "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \ ++ "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ ++ "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ ++ "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \ ++ "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8" ++ do ++ boost_tag_test=`expr "X$i" : 'X\([^@]*\) @ '` ++ boost_tag=`expr "X$i" : 'X[^@]* @ \(.*\)'` ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#if $boost_tag_test ++/* OK */ ++#else ++# error $boost_tag_test ++#endif ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ boost_cv_lib_tag=$boost_tag; break ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ case $boost_cv_lib_tag in #( ++ # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed ++ # to "gcc41" for instance. ++ *-gcc | *'-gcc ') :;; #( Don't re-add -gcc: it's already in there. ++ gcc*) ++ boost_tag_x= ++ case $host_os in #( ++ darwin*) ++ if test $boost_major_version -ge 136; then ++ # The `x' added in r46793 of Boost. ++ boost_tag_x=x ++ fi;; ++ esac ++ # We can specify multiple tags in this variable because it's used by ++ # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ... ++ boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc" ++ ;; #( ++ unknown) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not figure out which toolset name to use for $CXX" >&5 ++$as_echo "$as_me: WARNING: could not figure out which toolset name to use for $CXX" >&2;} ++ boost_cv_lib_tag= ++ ;; ++ esac ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_tag" >&5 ++$as_echo "$boost_cv_lib_tag" >&6; } ++# Check whether --enable-static-boost was given. ++if test "${enable_static_boost+set}" = set; then : ++ enableval=$enable_static_boost; enable_static_boost=yes ++else ++ enable_static_boost=no ++fi ++ ++# Check whether we do better use `mt' even though we weren't ask to. ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#if defined _REENTRANT || defined _MT || defined __MT__ ++/* use -mt */ ++#else ++# error MT not needed ++#endif ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ boost_guess_use_mt=: ++else ++ boost_guess_use_mt=false ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "x$with_gnumeric_filter" != "xno"; then : + +@@ -17167,6 +16637,13 @@ + + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" ++# Now let's try to find the library. The algorithm is as follows: first look ++# for a given library name according to the user's PREFERRED-RT-OPT. For each ++# library name, we prefer to use the ones that carry the tag (toolset name). ++# Each library is searched through the various standard paths were Boost is ++# usually installed. If we can't find the standard variants, we try to ++# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist ++# but there's -obviously- libboost_threads-mt.dylib). + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost iostreams library" >&5 + $as_echo_n "checking for the Boost iostreams library... " >&6; } + if ${boost_cv_lib_iostreams+:} false; then : +@@ -17174,19 +16651,19 @@ + else + boost_cv_lib_iostreams=no + case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; ++ mt | mt-) boost_mt=-mt; boost_rtopt=;; #( ++ mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( ++ *) boost_mt=; boost_rtopt=;; + esac + if test $enable_static_boost = yes; then + boost_rtopt="s$boost_rtopt" + fi + # Find the proper debug variant depending on what we've been asked to find. + case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') ++ *d*) boost_rt_d=$boost_rtopt;; #( ++ *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') + boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; ++ *) boost_rt_d='-d';; + esac + # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +@@ -17217,22 +16694,21 @@ + rm -f core conftest.err conftest.$ac_objext + ac_objext=$boost_save_ac_objext + boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in iostreams; do ++# Don't bother to ident the 6 nested for loops, only the 2 innermost ones ++# matter. + for boost_tag_ in -$boost_cv_lib_tag ''; do + for boost_ver_ in -$boost_cv_lib_version ''; do + for boost_mt_ in $boost_mt -mt ''; do + for boost_rtopt_ in $boost_rtopt '' -d; do + for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ ++ boost_iostreams$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ ++ boost_iostreams$boost_tag_$boost_rtopt_$boost_ver_ \ ++ boost_iostreams$boost_tag_$boost_mt_$boost_ver_ \ ++ boost_iostreams$boost_tag_$boost_ver_ + do + # Avoid testing twice the same lib + case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; ++ *@$boost_lib@*) continue;; + esac + # If with_boost is empty, we'll search in /lib first, which is not quite + # right so instead we'll try to a location based on where the headers are. +@@ -17242,17 +16718,14 @@ + /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ + "$with_boost" C:/Boost/lib /lib* + do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi ++ test -e "$boost_ldpath" || continue + boost_save_LDFLAGS=$LDFLAGS + # Are we looking for a static library? + case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) ++ *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) + boost_cv_lib_iostreams_LIBS="$boost_ldpath/lib$boost_lib.$libext" + test -e "$boost_cv_lib_iostreams_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. ++ *) # No: use -lboost_foo to find the shared library. + boost_cv_lib_iostreams_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +@@ -17281,11 +16754,11 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : + boost_cv_lib_iostreams=yes + else +@@ -17304,22 +16777,17 @@ + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS + if test x"$boost_cv_lib_iostreams" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 ++ # Check or used cached result of whether or not using -R or -rpath makes sense. ++ # Some implementations of ld, such as for Mac OSX, require -rpath but ++ # -R is the flag known to work on other systems. ++ # https://github.com/tsuna/boost.m4/issues/19 + if ${boost_cv_rpath_link_ldflag+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_iostreams_LIBS" +- rm -f conftest$ac_exeext ++ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do ++ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ LIBS="$boost_save_LIBS $boost_cv_lib_iostreams_LIBS" ++ rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext + boost_use_source=: + # If we already have a .o, re-use it. We change $ac_ext so that $ac_link +@@ -17342,14 +16810,14 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : + boost_rpath_link_ldflag_found=yes +- break ++ break + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 +@@ -17362,9 +16830,7 @@ + ac_ext=$boost_save_ac_ext + rm -f core conftest.err conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- done +- ;; +- esac ++ done + if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : + as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 + fi +@@ -17373,10 +16839,9 @@ + + fi + +- test x"$boost_ldpath" != x && +- boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" + boost_cv_lib_iostreams_LDPATH="$boost_ldpath" +- break 7 ++ break 6 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -17386,314 +16851,22 @@ + done + done + done +-done # boost_lib_ + rm -f conftest.$ac_objext + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_iostreams" >&5 + $as_echo "$boost_cv_lib_iostreams" >&6; } + case $boost_cv_lib_iostreams in #( +- (no) $as_echo "$as_me: failed program was:" >&5 ++ no) $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + as_fn_error $? "cannot find the flags to link with Boost iostreams" "$LINENO" 5 + ;; + esac +-BOOST_IOSTREAMS_LDFLAGS=$boost_cv_lib_iostreams_LDFLAGS +-BOOST_IOSTREAMS_LDPATH=$boost_cv_lib_iostreams_LDPATH +-BOOST_LDPATH=$boost_cv_lib_iostreams_LDPATH +-BOOST_IOSTREAMS_LIBS=$boost_cv_lib_iostreams_LIBS +-CPPFLAGS=$boost_save_CPPFLAGS +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-fi +- +- +- +- +-fi +- +-if test "x$with_tools" != "xno"; then : +- +- if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost program_options library" >&5 +-$as_echo "$as_me: Boost not available, not searching for the Boost program_options library" >&6;} +-else +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/program_options.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/program_options.hpp" >&6;} +-else +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-boost_save_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/program_options.hpp" "ac_cv_header_boost_program_options_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_program_options_hpp" = xyes; then : +- +-$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS_HPP 1" >>confdefs.h +- +-else +- as_fn_error $? "cannot find boost/program_options.hpp" "$LINENO" 5 +-fi +- +- +-CPPFLAGS=$boost_save_CPPFLAGS +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-fi +- +-boost_save_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost program_options library" >&5 +-$as_echo_n "checking for the Boost program_options library... " >&6; } +-if ${boost_cv_lib_program_options+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- boost_cv_lib_program_options=no +- case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; +- esac +- if test $enable_static_boost = yes; then +- boost_rtopt="s$boost_rtopt" +- fi +- # Find the proper debug variant depending on what we've been asked to find. +- case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') +- boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; +- esac +- # If the PREFERRED-RT-OPT are not empty, prepend a `-'. +- test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +- $boost_guess_use_mt && boost_mt=-mt +- # Look for the abs path the static archive. +- # $libext is computed by Libtool but let's make sure it's non empty. +- test -z "$libext" && +- as_fn_error $? "the libext variable is empty, did you invoke Libtool?" "$LINENO" 5 +- boost_save_ac_objext=$ac_objext +- # Generate the test file. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-boost::program_options::options_description d("test"); +- ; +- return 0; +-} +-_ACEOF +- if ac_fn_cxx_try_compile "$LINENO"; then : +- ac_objext=do_not_rm_me_plz +-else +- as_fn_error $? "cannot compile a test that uses Boost program_options" "$LINENO" 5 +-fi +-rm -f core conftest.err conftest.$ac_objext +- ac_objext=$boost_save_ac_objext +- boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in program_options; do +-for boost_tag_ in -$boost_cv_lib_tag ''; do +-for boost_ver_ in -$boost_cv_lib_version ''; do +-for boost_mt_ in $boost_mt -mt ''; do +-for boost_rtopt_ in $boost_rtopt '' -d; do +- for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ +- do +- # Avoid testing twice the same lib +- case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; +- esac +- # If with_boost is empty, we'll search in /lib first, which is not quite +- # right so instead we'll try to a location based on where the headers are. +- boost_tmp_lib=$with_boost +- test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include} +- for boost_ldpath in "$boost_tmp_lib/lib" '' \ +- /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ +- "$with_boost" C:/Boost/lib /lib* +- do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi +- boost_save_LDFLAGS=$LDFLAGS +- # Are we looking for a static library? +- case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) +- boost_cv_lib_program_options_LIBS="$boost_ldpath/lib$boost_lib.$libext" +- test -e "$boost_cv_lib_program_options_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. +- boost_cv_lib_program_options_LIBS="-l$boost_lib";; +- esac +- boost_save_LIBS=$LIBS +- LIBS="$boost_cv_lib_program_options_LIBS $LIBS" +- test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" +- rm -f conftest$ac_exeext +-boost_save_ac_ext=$ac_ext +-boost_use_source=: +-# If we already have a .o, re-use it. We change $ac_ext so that $ac_link +-# tries to link the existing object file instead of compiling from source. +-test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && +- $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5 +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext +- }; then : +- boost_cv_lib_program_options=yes +-else +- if $boost_use_source; then +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- fi +- boost_cv_lib_program_options=no +-fi +-ac_objext=$boost_save_ac_objext +-ac_ext=$boost_save_ac_ext +-rm -f core conftest.err conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- ac_objext=$boost_save_ac_objext +- LDFLAGS=$boost_save_LDFLAGS +- LIBS=$boost_save_LIBS +- if test x"$boost_cv_lib_program_options" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 +- if ${boost_cv_rpath_link_ldflag+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_program_options_LIBS" +- rm -f conftest$ac_exeext +-boost_save_ac_ext=$ac_ext +-boost_use_source=: +-# If we already have a .o, re-use it. We change $ac_ext so that $ac_link +-# tries to link the existing object file instead of compiling from source. +-test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && +- $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5 +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext +- }; then : +- boost_rpath_link_ldflag_found=yes +- break +-else +- if $boost_use_source; then +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- fi +- boost_rpath_link_ldflag_found=no +-fi +-ac_objext=$boost_save_ac_objext +-ac_ext=$boost_save_ac_ext +-rm -f core conftest.err conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- done +- ;; +- esac +- if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : +- as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 +-fi +- LDFLAGS=$boost_save_LDFLAGS +- LIBS=$boost_save_LIBS +- +-fi +- +- test x"$boost_ldpath" != x && +- boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- boost_cv_lib_program_options_LDPATH="$boost_ldpath" +- break 7 +- else +- boost_failed_libs="$boost_failed_libs@$boost_lib@" +- fi +- done +- done +-done +-done +-done +-done +-done # boost_lib_ +-rm -f conftest.$ac_objext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_program_options" >&5 +-$as_echo "$boost_cv_lib_program_options" >&6; } +-case $boost_cv_lib_program_options in #( +- (no) $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- as_fn_error $? "cannot find the flags to link with Boost program_options" "$LINENO" 5 +- ;; +-esac +-BOOST_PROGRAM_OPTIONS_LDFLAGS=$boost_cv_lib_program_options_LDFLAGS +-BOOST_PROGRAM_OPTIONS_LDPATH=$boost_cv_lib_program_options_LDPATH +-BOOST_LDPATH=$boost_cv_lib_program_options_LDPATH +-BOOST_PROGRAM_OPTIONS_LIBS=$boost_cv_lib_program_options_LIBS ++BOOST_IOSTREAMS_LDFLAGS=$boost_cv_lib_iostreams_LDFLAGS ++BOOST_IOSTREAMS_LDPATH=$boost_cv_lib_iostreams_LDPATH ++BOOST_LDPATH=$boost_cv_lib_iostreams_LDPATH ++BOOST_IOSTREAMS_LIBS=$boost_cv_lib_iostreams_LIBS + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -17704,13 +16877,14 @@ + + + +- # Do we have to check for Boost.System? This link-time dependency was +-# added as of 1.35.0. If we have a version <1.35, we must not attempt to +-# find Boost.System as it didn't exist by then. +-if test $boost_major_version -ge 135; then +- if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5 +-$as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;} ++ ++fi ++ ++if test "x$with_tools" != "xno"; then : ++ ++ if test x"$boost_cv_inc_path" = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost program_options library" >&5 ++$as_echo "$as_me: Boost not available, not searching for the Boost program_options library" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -17718,8 +16892,8 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/system/error_code.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/system/error_code.hpp" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/program_options.hpp" >&5 ++$as_echo "$as_me: Boost not available, not searching for boost/program_options.hpp" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -17728,13 +16902,13 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/system/error_code.hpp" "ac_cv_header_boost_system_error_code_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_system_error_code_hpp" = xyes; then : ++ac_fn_cxx_check_header_mongrel "$LINENO" "boost/program_options.hpp" "ac_cv_header_boost_program_options_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_program_options_hpp" = xyes; then : + +-$as_echo "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h ++$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS_HPP 1" >>confdefs.h + + else +- as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 ++ as_fn_error $? "cannot find boost/program_options.hpp" "$LINENO" 5 + fi + + +@@ -17748,26 +16922,33 @@ + + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5 +-$as_echo_n "checking for the Boost system library... " >&6; } +-if ${boost_cv_lib_system+:} false; then : ++# Now let's try to find the library. The algorithm is as follows: first look ++# for a given library name according to the user's PREFERRED-RT-OPT. For each ++# library name, we prefer to use the ones that carry the tag (toolset name). ++# Each library is searched through the various standard paths were Boost is ++# usually installed. If we can't find the standard variants, we try to ++# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist ++# but there's -obviously- libboost_threads-mt.dylib). ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost program_options library" >&5 ++$as_echo_n "checking for the Boost program_options library... " >&6; } ++if ${boost_cv_lib_program_options+:} false; then : + $as_echo_n "(cached) " >&6 + else +- boost_cv_lib_system=no ++ boost_cv_lib_program_options=no + case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; ++ mt | mt-) boost_mt=-mt; boost_rtopt=;; #( ++ mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( ++ *) boost_mt=; boost_rtopt=;; + esac + if test $enable_static_boost = yes; then + boost_rtopt="s$boost_rtopt" + fi + # Find the proper debug variant depending on what we've been asked to find. + case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') ++ *d*) boost_rt_d=$boost_rtopt;; #( ++ *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') + boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; ++ *) boost_rt_d='-d';; + esac + # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +@@ -17780,12 +16961,12 @@ + # Generate the test file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + + int + main () + { +-boost::system::error_code e; e.clear(); ++boost::program_options::options_description d("test"); + ; + return 0; + } +@@ -17793,27 +16974,26 @@ + if ac_fn_cxx_try_compile "$LINENO"; then : + ac_objext=do_not_rm_me_plz + else +- as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5 ++ as_fn_error $? "cannot compile a test that uses Boost program_options" "$LINENO" 5 + fi + rm -f core conftest.err conftest.$ac_objext + ac_objext=$boost_save_ac_objext + boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in system; do ++# Don't bother to ident the 6 nested for loops, only the 2 innermost ones ++# matter. + for boost_tag_ in -$boost_cv_lib_tag ''; do + for boost_ver_ in -$boost_cv_lib_version ''; do + for boost_mt_ in $boost_mt -mt ''; do + for boost_rtopt_ in $boost_rtopt '' -d; do + for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ ++ boost_program_options$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ ++ boost_program_options$boost_tag_$boost_rtopt_$boost_ver_ \ ++ boost_program_options$boost_tag_$boost_mt_$boost_ver_ \ ++ boost_program_options$boost_tag_$boost_ver_ + do + # Avoid testing twice the same lib + case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; ++ *@$boost_lib@*) continue;; + esac + # If with_boost is empty, we'll search in /lib first, which is not quite + # right so instead we'll try to a location based on where the headers are. +@@ -17823,21 +17003,18 @@ + /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ + "$with_boost" C:/Boost/lib /lib* + do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi ++ test -e "$boost_ldpath" || continue + boost_save_LDFLAGS=$LDFLAGS + # Are we looking for a static library? + case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) +- boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext" +- test -e "$boost_cv_lib_system_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. +- boost_cv_lib_system_LIBS="-l$boost_lib";; ++ *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) ++ boost_cv_lib_program_options_LIBS="$boost_ldpath/lib$boost_lib.$libext" ++ test -e "$boost_cv_lib_program_options_LIBS" || continue;; #( ++ *) # No: use -lboost_foo to find the shared library. ++ boost_cv_lib_program_options_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +- LIBS="$boost_cv_lib_system_LIBS $LIBS" ++ LIBS="$boost_cv_lib_program_options_LIBS $LIBS" + test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" + rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext +@@ -17862,20 +17039,20 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : +- boost_cv_lib_system=yes ++ boost_cv_lib_program_options=yes + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +- boost_cv_lib_system=no ++ boost_cv_lib_program_options=no + fi + ac_objext=$boost_save_ac_objext + ac_ext=$boost_save_ac_ext +@@ -17884,23 +17061,18 @@ + ac_objext=$boost_save_ac_objext + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS +- if test x"$boost_cv_lib_system" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 ++ if test x"$boost_cv_lib_program_options" = xyes; then ++ # Check or used cached result of whether or not using -R or -rpath makes sense. ++ # Some implementations of ld, such as for Mac OSX, require -rpath but ++ # -R is the flag known to work on other systems. ++ # https://github.com/tsuna/boost.m4/issues/19 + if ${boost_cv_rpath_link_ldflag+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS" +- rm -f conftest$ac_exeext ++ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do ++ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ LIBS="$boost_save_LIBS $boost_cv_lib_program_options_LIBS" ++ rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext + boost_use_source=: + # If we already have a .o, re-use it. We change $ac_ext so that $ac_link +@@ -17923,14 +17095,14 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : + boost_rpath_link_ldflag_found=yes +- break ++ break + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 +@@ -17943,9 +17115,7 @@ + ac_ext=$boost_save_ac_ext + rm -f core conftest.err conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- done +- ;; +- esac ++ done + if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : + as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 + fi +@@ -17954,10 +17124,9 @@ + + fi + +- test x"$boost_ldpath" != x && +- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- boost_cv_lib_system_LDPATH="$boost_ldpath" +- break 7 ++ boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ boost_cv_lib_program_options_LDPATH="$boost_ldpath" ++ break 6 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -17967,23 +17136,22 @@ + done + done + done +-done # boost_lib_ + rm -f conftest.$ac_objext + + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5 +-$as_echo "$boost_cv_lib_system" >&6; } +-case $boost_cv_lib_system in #( +- (no) $as_echo "$as_me: failed program was:" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_program_options" >&5 ++$as_echo "$boost_cv_lib_program_options" >&6; } ++case $boost_cv_lib_program_options in #( ++ no) $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5 ++ as_fn_error $? "cannot find the flags to link with Boost program_options" "$LINENO" 5 + ;; + esac +-BOOST_SYSTEM_LDFLAGS=$boost_cv_lib_system_LDFLAGS +-BOOST_SYSTEM_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_SYSTEM_LIBS=$boost_cv_lib_system_LIBS ++BOOST_PROGRAM_OPTIONS_LDFLAGS=$boost_cv_lib_program_options_LDFLAGS ++BOOST_PROGRAM_OPTIONS_LDPATH=$boost_cv_lib_program_options_LDPATH ++BOOST_LDPATH=$boost_cv_lib_program_options_LDPATH ++BOOST_PROGRAM_OPTIONS_LIBS=$boost_cv_lib_program_options_LIBS + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -17994,14 +17162,13 @@ + + + +-fi # end of the Boost.System check. +-boost_filesystem_save_LIBS=$LIBS +-boost_filesystem_save_LDFLAGS=$LDFLAGS +-LIBS="$LIBS $BOOST_SYSTEM_LIBS" +-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++ # Do we have to check for Boost.System? This link-time dependency was ++# added as of 1.35.0. If we have a version <1.35, we must not attempt to ++# find Boost.System as it didn't exist by then. ++if test $boost_major_version -ge 135; then + if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost filesystem library" >&5 +-$as_echo "$as_me: Boost not available, not searching for the Boost filesystem library" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5 ++$as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18009,8 +17176,8 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/filesystem/path.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/filesystem/path.hpp" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/system/error_code.hpp" >&5 ++$as_echo "$as_me: Boost not available, not searching for boost/system/error_code.hpp" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18019,13 +17186,13 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/filesystem/path.hpp" "ac_cv_header_boost_filesystem_path_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_filesystem_path_hpp" = xyes; then : ++ac_fn_cxx_check_header_mongrel "$LINENO" "boost/system/error_code.hpp" "ac_cv_header_boost_system_error_code_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_system_error_code_hpp" = xyes; then : + +-$as_echo "#define HAVE_BOOST_FILESYSTEM_PATH_HPP 1" >>confdefs.h ++$as_echo "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h + + else +- as_fn_error $? "cannot find boost/filesystem/path.hpp" "$LINENO" 5 ++ as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 + fi + + +@@ -18039,26 +17206,33 @@ + + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost filesystem library" >&5 +-$as_echo_n "checking for the Boost filesystem library... " >&6; } +-if ${boost_cv_lib_filesystem+:} false; then : ++# Now let's try to find the library. The algorithm is as follows: first look ++# for a given library name according to the user's PREFERRED-RT-OPT. For each ++# library name, we prefer to use the ones that carry the tag (toolset name). ++# Each library is searched through the various standard paths were Boost is ++# usually installed. If we can't find the standard variants, we try to ++# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist ++# but there's -obviously- libboost_threads-mt.dylib). ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5 ++$as_echo_n "checking for the Boost system library... " >&6; } ++if ${boost_cv_lib_system+:} false; then : + $as_echo_n "(cached) " >&6 + else +- boost_cv_lib_filesystem=no ++ boost_cv_lib_system=no + case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; ++ mt | mt-) boost_mt=-mt; boost_rtopt=;; #( ++ mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( ++ *) boost_mt=; boost_rtopt=;; + esac + if test $enable_static_boost = yes; then + boost_rtopt="s$boost_rtopt" + fi + # Find the proper debug variant depending on what we've been asked to find. + case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') ++ *d*) boost_rt_d=$boost_rtopt;; #( ++ *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') + boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; ++ *) boost_rt_d='-d';; + esac + # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +@@ -18071,12 +17245,12 @@ + # Generate the test file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + + int + main () + { +-boost::filesystem::path p; ++boost::system::error_code e; e.clear(); + ; + return 0; + } +@@ -18084,27 +17258,26 @@ + if ac_fn_cxx_try_compile "$LINENO"; then : + ac_objext=do_not_rm_me_plz + else +- as_fn_error $? "cannot compile a test that uses Boost filesystem" "$LINENO" 5 ++ as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5 + fi + rm -f core conftest.err conftest.$ac_objext + ac_objext=$boost_save_ac_objext + boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in filesystem; do ++# Don't bother to ident the 6 nested for loops, only the 2 innermost ones ++# matter. + for boost_tag_ in -$boost_cv_lib_tag ''; do + for boost_ver_ in -$boost_cv_lib_version ''; do + for boost_mt_ in $boost_mt -mt ''; do + for boost_rtopt_ in $boost_rtopt '' -d; do + for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ ++ boost_system$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ ++ boost_system$boost_tag_$boost_rtopt_$boost_ver_ \ ++ boost_system$boost_tag_$boost_mt_$boost_ver_ \ ++ boost_system$boost_tag_$boost_ver_ + do + # Avoid testing twice the same lib + case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; ++ *@$boost_lib@*) continue;; + esac + # If with_boost is empty, we'll search in /lib first, which is not quite + # right so instead we'll try to a location based on where the headers are. +@@ -18114,21 +17287,18 @@ + /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ + "$with_boost" C:/Boost/lib /lib* + do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi ++ test -e "$boost_ldpath" || continue + boost_save_LDFLAGS=$LDFLAGS + # Are we looking for a static library? + case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) +- boost_cv_lib_filesystem_LIBS="$boost_ldpath/lib$boost_lib.$libext" +- test -e "$boost_cv_lib_filesystem_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. +- boost_cv_lib_filesystem_LIBS="-l$boost_lib";; ++ *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) ++ boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext" ++ test -e "$boost_cv_lib_system_LIBS" || continue;; #( ++ *) # No: use -lboost_foo to find the shared library. ++ boost_cv_lib_system_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +- LIBS="$boost_cv_lib_filesystem_LIBS $LIBS" ++ LIBS="$boost_cv_lib_system_LIBS $LIBS" + test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" + rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext +@@ -18153,20 +17323,20 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : +- boost_cv_lib_filesystem=yes ++ boost_cv_lib_system=yes + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +- boost_cv_lib_filesystem=no ++ boost_cv_lib_system=no + fi + ac_objext=$boost_save_ac_objext + ac_ext=$boost_save_ac_ext +@@ -18175,23 +17345,18 @@ + ac_objext=$boost_save_ac_objext + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS +- if test x"$boost_cv_lib_filesystem" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 ++ if test x"$boost_cv_lib_system" = xyes; then ++ # Check or used cached result of whether or not using -R or -rpath makes sense. ++ # Some implementations of ld, such as for Mac OSX, require -rpath but ++ # -R is the flag known to work on other systems. ++ # https://github.com/tsuna/boost.m4/issues/19 + if ${boost_cv_rpath_link_ldflag+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_filesystem_LIBS" +- rm -f conftest$ac_exeext ++ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do ++ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS" ++ rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext + boost_use_source=: + # If we already have a .o, re-use it. We change $ac_ext so that $ac_link +@@ -18214,14 +17379,14 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : + boost_rpath_link_ldflag_found=yes +- break ++ break + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 +@@ -18234,9 +17399,7 @@ + ac_ext=$boost_save_ac_ext + rm -f core conftest.err conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- done +- ;; +- esac ++ done + if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : + as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 + fi +@@ -18245,10 +17408,9 @@ + + fi + +- test x"$boost_ldpath" != x && +- boost_cv_lib_filesystem_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- boost_cv_lib_filesystem_LDPATH="$boost_ldpath" +- break 7 ++ boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ boost_cv_lib_system_LDPATH="$boost_ldpath" ++ break 6 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -18258,23 +17420,22 @@ + done + done + done +-done # boost_lib_ + rm -f conftest.$ac_objext + + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_filesystem" >&5 +-$as_echo "$boost_cv_lib_filesystem" >&6; } +-case $boost_cv_lib_filesystem in #( +- (no) $as_echo "$as_me: failed program was:" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5 ++$as_echo "$boost_cv_lib_system" >&6; } ++case $boost_cv_lib_system in #( ++ no) $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- as_fn_error $? "cannot find the flags to link with Boost filesystem" "$LINENO" 5 ++ as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5 + ;; + esac +-BOOST_FILESYSTEM_LDFLAGS=$boost_cv_lib_filesystem_LDFLAGS +-BOOST_FILESYSTEM_LDPATH=$boost_cv_lib_filesystem_LDPATH +-BOOST_LDPATH=$boost_cv_lib_filesystem_LDPATH +-BOOST_FILESYSTEM_LIBS=$boost_cv_lib_filesystem_LIBS ++BOOST_SYSTEM_LDFLAGS=$boost_cv_lib_system_LDFLAGS ++BOOST_SYSTEM_LDPATH=$boost_cv_lib_system_LDPATH ++BOOST_LDPATH=$boost_cv_lib_system_LDPATH ++BOOST_SYSTEM_LIBS=$boost_cv_lib_system_LIBS + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18283,16 +17444,16 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi + +-if test $enable_static_boost = yes && test $boost_major_version -ge 135; then +- BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" +-fi +-LIBS=$boost_filesystem_save_LIBS +-LDFLAGS=$boost_filesystem_save_LDFLAGS + + +- if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5 +-$as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;} ++fi # end of the Boost.System check. ++boost_filesystem_save_LIBS=$LIBS ++boost_filesystem_save_LDFLAGS=$LDFLAGS ++LIBS="$LIBS $BOOST_SYSTEM_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++if test x"$boost_cv_inc_path" = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost filesystem library" >&5 ++$as_echo "$as_me: Boost not available, not searching for the Boost filesystem library" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18300,8 +17461,8 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/system/error_code.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/system/error_code.hpp" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/filesystem/path.hpp" >&5 ++$as_echo "$as_me: Boost not available, not searching for boost/filesystem/path.hpp" >&6;} + else + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18310,13 +17471,13 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/system/error_code.hpp" "ac_cv_header_boost_system_error_code_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_system_error_code_hpp" = xyes; then : ++ac_fn_cxx_check_header_mongrel "$LINENO" "boost/filesystem/path.hpp" "ac_cv_header_boost_filesystem_path_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_filesystem_path_hpp" = xyes; then : + +-$as_echo "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h ++$as_echo "#define HAVE_BOOST_FILESYSTEM_PATH_HPP 1" >>confdefs.h + + else +- as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 ++ as_fn_error $? "cannot find boost/filesystem/path.hpp" "$LINENO" 5 + fi + + +@@ -18330,26 +17491,33 @@ + + boost_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost system library" >&5 +-$as_echo_n "checking for the Boost system library... " >&6; } +-if ${boost_cv_lib_system+:} false; then : ++# Now let's try to find the library. The algorithm is as follows: first look ++# for a given library name according to the user's PREFERRED-RT-OPT. For each ++# library name, we prefer to use the ones that carry the tag (toolset name). ++# Each library is searched through the various standard paths were Boost is ++# usually installed. If we can't find the standard variants, we try to ++# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist ++# but there's -obviously- libboost_threads-mt.dylib). ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost filesystem library" >&5 ++$as_echo_n "checking for the Boost filesystem library... " >&6; } ++if ${boost_cv_lib_filesystem+:} false; then : + $as_echo_n "(cached) " >&6 + else +- boost_cv_lib_system=no ++ boost_cv_lib_filesystem=no + case "" in #( +- (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( +- (*) boost_mt=; boost_rtopt=;; ++ mt | mt-) boost_mt=-mt; boost_rtopt=;; #( ++ mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #( ++ *) boost_mt=; boost_rtopt=;; + esac + if test $enable_static_boost = yes; then + boost_rtopt="s$boost_rtopt" + fi + # Find the proper debug variant depending on what we've been asked to find. + case $boost_rtopt in #( +- (*d*) boost_rt_d=$boost_rtopt;; #( +- (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') ++ *d*) boost_rt_d=$boost_rtopt;; #( ++ *[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn') + boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( +- (*) boost_rt_d='-d';; ++ *) boost_rt_d='-d';; + esac + # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" +@@ -18362,12 +17530,12 @@ + # Generate the test file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + + int + main () + { +-boost::system::error_code e; e.clear(); ++boost::filesystem::path p; + ; + return 0; + } +@@ -18375,27 +17543,26 @@ + if ac_fn_cxx_try_compile "$LINENO"; then : + ac_objext=do_not_rm_me_plz + else +- as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5 ++ as_fn_error $? "cannot compile a test that uses Boost filesystem" "$LINENO" 5 + fi + rm -f core conftest.err conftest.$ac_objext + ac_objext=$boost_save_ac_objext + boost_failed_libs= +-# Don't bother to ident the following nested for loops, only the 2 +-# innermost ones matter. +-for boost_lib_ in system; do ++# Don't bother to ident the 6 nested for loops, only the 2 innermost ones ++# matter. + for boost_tag_ in -$boost_cv_lib_tag ''; do + for boost_ver_ in -$boost_cv_lib_version ''; do + for boost_mt_ in $boost_mt -mt ''; do + for boost_rtopt_ in $boost_rtopt '' -d; do + for boost_lib in \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$boost_lib_$boost_tag_$boost_ver_ ++ boost_filesystem$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ ++ boost_filesystem$boost_tag_$boost_rtopt_$boost_ver_ \ ++ boost_filesystem$boost_tag_$boost_mt_$boost_ver_ \ ++ boost_filesystem$boost_tag_$boost_ver_ + do + # Avoid testing twice the same lib + case $boost_failed_libs in #( +- (*@$boost_lib@*) continue;; ++ *@$boost_lib@*) continue;; + esac + # If with_boost is empty, we'll search in /lib first, which is not quite + # right so instead we'll try to a location based on where the headers are. +@@ -18405,21 +17572,18 @@ + /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ + "$with_boost" C:/Boost/lib /lib* + do +- # Don't waste time with directories that don't exist. +- if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then +- continue +- fi ++ test -e "$boost_ldpath" || continue + boost_save_LDFLAGS=$LDFLAGS + # Are we looking for a static library? + case $boost_ldpath:$boost_rtopt_ in #( +- (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) +- boost_cv_lib_system_LIBS="$boost_ldpath/lib$boost_lib.$libext" +- test -e "$boost_cv_lib_system_LIBS" || continue;; #( +- (*) # No: use -lboost_foo to find the shared library. +- boost_cv_lib_system_LIBS="-l$boost_lib";; ++ *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) ++ boost_cv_lib_filesystem_LIBS="$boost_ldpath/lib$boost_lib.$libext" ++ test -e "$boost_cv_lib_filesystem_LIBS" || continue;; #( ++ *) # No: use -lboost_foo to find the shared library. ++ boost_cv_lib_filesystem_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +- LIBS="$boost_cv_lib_system_LIBS $LIBS" ++ LIBS="$boost_cv_lib_filesystem_LIBS $LIBS" + test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" + rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext +@@ -18444,20 +17608,20 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : +- boost_cv_lib_system=yes ++ boost_cv_lib_filesystem=yes + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +- boost_cv_lib_system=no ++ boost_cv_lib_filesystem=no + fi + ac_objext=$boost_save_ac_objext + ac_ext=$boost_save_ac_ext +@@ -18466,23 +17630,18 @@ + ac_objext=$boost_save_ac_objext + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS +- if test x"$boost_cv_lib_system" = xyes; then +- # Check or used cached result of whether or not using -R or +- # -rpath makes sense. Some implementations of ld, such as for +- # Mac OSX, require -rpath but -R is the flag known to work on +- # other systems. https://github.com/tsuna/boost.m4/issues/19 ++ if test x"$boost_cv_lib_filesystem" = xyes; then ++ # Check or used cached result of whether or not using -R or -rpath makes sense. ++ # Some implementations of ld, such as for Mac OSX, require -rpath but ++ # -R is the flag known to work on other systems. ++ # https://github.com/tsuna/boost.m4/issues/19 + if ${boost_cv_rpath_link_ldflag+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $boost_ldpath in +- '') # Nothing to do. +- boost_cv_rpath_link_ldflag= +- boost_rpath_link_ldflag_found=yes;; +- *) +- for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do +- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- LIBS="$boost_save_LIBS $boost_cv_lib_system_LIBS" +- rm -f conftest$ac_exeext ++ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do ++ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ LIBS="$boost_save_LIBS $boost_cv_lib_filesystem_LIBS" ++ rm -f conftest$ac_exeext + boost_save_ac_ext=$ac_ext + boost_use_source=: + # If we already have a .o, re-use it. We change $ac_ext so that $ac_link +@@ -18505,14 +17664,14 @@ + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_executable_p conftest$ac_exeext ++ test "$cross_compiling" = yes || ++ $as_executable_p conftest$ac_exeext + }; then : + boost_rpath_link_ldflag_found=yes +- break ++ break + else + if $boost_use_source; then + $as_echo "$as_me: failed program was:" >&5 +@@ -18525,9 +17684,7 @@ + ac_ext=$boost_save_ac_ext + rm -f core conftest.err conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- done +- ;; +- esac ++ done + if test "x$boost_rpath_link_ldflag_found" != "xyes"; then : + as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5 + fi +@@ -18536,10 +17693,9 @@ + + fi + +- test x"$boost_ldpath" != x && +- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" +- boost_cv_lib_system_LDPATH="$boost_ldpath" +- break 7 ++ boost_cv_lib_filesystem_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ boost_cv_lib_filesystem_LDPATH="$boost_ldpath" ++ break 6 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -18549,23 +17705,22 @@ + done + done + done +-done # boost_lib_ + rm -f conftest.$ac_objext + + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5 +-$as_echo "$boost_cv_lib_system" >&6; } +-case $boost_cv_lib_system in #( +- (no) $as_echo "$as_me: failed program was:" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_filesystem" >&5 ++$as_echo "$boost_cv_lib_filesystem" >&6; } ++case $boost_cv_lib_filesystem in #( ++ no) $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- as_fn_error $? "cannot find the flags to link with Boost system" "$LINENO" 5 ++ as_fn_error $? "cannot find the flags to link with Boost filesystem" "$LINENO" 5 + ;; + esac +-BOOST_SYSTEM_LDFLAGS=$boost_cv_lib_system_LDFLAGS +-BOOST_SYSTEM_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_LDPATH=$boost_cv_lib_system_LDPATH +-BOOST_SYSTEM_LIBS=$boost_cv_lib_system_LIBS ++BOOST_FILESYSTEM_LDFLAGS=$boost_cv_lib_filesystem_LDFLAGS ++BOOST_FILESYSTEM_LDPATH=$boost_cv_lib_filesystem_LDPATH ++BOOST_LDPATH=$boost_cv_lib_filesystem_LDPATH ++BOOST_FILESYSTEM_LIBS=$boost_cv_lib_filesystem_LIBS + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -18574,6 +17729,12 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi + ++if test $enable_static_boost = yes && test $boost_major_version -ge 135; then ++ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" ++ ++fi ++LIBS=$boost_filesystem_save_LIBS ++LDFLAGS=$boost_filesystem_save_LDFLAGS + + + +@@ -18591,12 +17752,12 @@ + pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.8.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "mdds >= 0.8.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds >= 0.11.0" 2>/dev/null` ++ pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds >= 0.8.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18608,12 +17769,12 @@ + pkg_cv_MDDS_LIBS="$MDDS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.8.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "mdds >= 0.8.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds >= 0.11.0" 2>/dev/null` ++ pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds >= 0.8.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18634,14 +17795,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1` ++ MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds >= 0.8.0" 2>&1` + else +- MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1` ++ MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds >= 0.8.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MDDS_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (mdds >= 0.11.0) were not met: ++ as_fn_error $? "Package requirements (mdds >= 0.8.0) were not met: + + $MDDS_PKG_ERRORS + +@@ -20538,7 +19699,7 @@ + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Older Autoconf quotes --file arguments for eval, but not when files ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -20589,7 +19750,7 @@ + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "$am__include" && continue ++ test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the +@@ -21476,7 +20637,6 @@ + ============================================================================== + Build configuration: + debug: $enable_debug +- werror: $enable_werror + spreadsheet-model: $enable_spreadsheet_model + gnumeric-filter: $with_gnumeric_filter + ods-filter: $with_ods_filter +@@ -21489,7 +20649,6 @@ + ============================================================================== + Build configuration: + debug: $enable_debug +- werror: $enable_werror + spreadsheet-model: $enable_spreadsheet_model + gnumeric-filter: $with_gnumeric_filter + ods-filter: $with_ods_filter -- 2.5.0