[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/liborcus
David Tardon
dtardon at redhat.com
Fri Mar 20 02:51:41 PDT 2015
external/liborcus/UnpackedTarball_liborcus.mk | 2
external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 | 1750 ++++++++++++++++
2 files changed, 1752 insertions(+)
New commits:
commit fa654c2f626dd0d461c3a6c72dc02b83fc50f9f7
Author: David Tardon <dtardon at redhat.com>
Date: Mon Feb 9 23:50:03 2015 +0100
fix liborcus build with gcc 5
(cherry picked from commit 8b68841c1482d98bee98de0a60910b93feb8f8b6)
How is that supposed to ever work?
(cherry picked from commit a5ec343f6cb522f4d41e097eda48042bf85c4578)
...next attempt at getting this through both GCC 5 and MSVC
(cherry picked from commit cdd8ab7e0caa5b6845581afd5fc69bc69b5589df)
Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184
Reviewed-on: https://gerrit.libreoffice.org/14817
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 696c34a..66022d5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -29,6 +29,8 @@ endif
# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
# f60d6eecee72349993a392a9a63ddf3383d3b8c8 at 2>:
+liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
))
diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
new file mode 100644
index 0000000..42370c2
--- /dev/null
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -0,0 +1,1750 @@
+--- configure.old 2013-10-15 04:17:59.000000000 +0200
++++ configure 2015-02-09 23:41:48.525767041 +0100
+@@ -1471,7 +1471,7 @@ Optional Features:
+ --disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-static-boost Prefer the static boost libraries over the shared
+ ones [no]
+- --disable-werror Treat all warnings as errors, useful for development
++ --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
+@@ -2592,7 +2592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ac_config_headers="$ac_config_headers config.h"
+
+-am__api_version='1.12'
++am__api_version='1.14'
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2805,8 +2805,8 @@ if test x"${MISSING+set}" != xset; then
+ esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
++if eval "$MISSING --is-lightweight"; then
++ am_missing_run="$MISSING "
+ else
+ am_missing_run=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+@@ -3046,6 +3046,45 @@ else
+ 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."
+@@ -3096,19 +3135,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-mkdir_p="$MKDIR_P"
++# For better backward compatibility. To be removed once Automake 1.9.x
++# dies out for good. For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++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: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake at 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: <http://www.gnu.org/software/coreutils/>.
++
++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;
+@@ -4011,6 +4101,65 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ 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
+@@ -7073,7 +7222,7 @@ ia64-*-hpux*)
+ rm -rf conftest*
+ ;;
+
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+@@ -7091,7 +7240,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*linux*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -7110,7 +7262,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*linux*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+@@ -11133,10 +11288,14 @@ fi
+ # 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="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14964,10 +15123,14 @@ fi
+ # 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="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16040,7 +16203,7 @@ $as_echo "#define BOOST_ALL_NO_LIB /**/"
+ # ======================
+ # Set required ixion api
+ # ======================
+-IXION_REQUIRED_API_VERSION=0.8
++IXION_REQUIRED_API_VERSION=0.10
+
+
+ # =============
+@@ -16049,7 +16212,7 @@ IXION_REQUIRED_API_VERSION=0.8
+ ORCUS_API_VERSION=0.8
+
+
+-echo "$as_me: this is boost.m4 serial 18" >&5
++echo "$as_me: this is boost.m4 serial 24" >&5
+ boost_save_IFS=$IFS
+ boost_version_req=1.36
+ IFS=.
+@@ -16193,17 +16356,30 @@ $as_echo_n "checking for Boost's header
+ if ${boost_cv_lib_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat confdefs.h - <<_ACEOF >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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <boost/version.hpp>
+ 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' |
+- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
++ tr -s '\n' ' ' |
++ $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
+@@ -16212,7 +16387,7 @@ $as_echo "$boost_cv_lib_version" >&6; }
+ 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
+@@ -16244,14 +16419,53 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ # 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 \
+@@ -16338,6 +16552,11 @@ else
+ 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. */
+
+@@ -16361,6 +16580,11 @@ 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
+@@ -16402,13 +16626,6 @@ fi
+
+ 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 system library" >&5
+ $as_echo_n "checking for the Boost system library... " >&6; }
+ if ${boost_cv_lib_system+:} false; then :
+@@ -16416,19 +16633,19 @@ if ${boost_cv_lib_system+:} false; then
+ 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=;;
++ (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"
+@@ -16459,21 +16676,22 @@ fi
+ rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# 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_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_
++ 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;;
++ (*@$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.
+@@ -16483,14 +16701,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # 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)
++ (*?*:*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.
++ (*) # No: use -lboost_foo to find the shared library.
+ boost_cv_lib_system_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+@@ -16519,11 +16740,11 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+ else
+@@ -16542,17 +16763,22 @@ rm -f core conftest.err conftest_ipa8_co
+ 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
++ # 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
+- 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
++ 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
+@@ -16575,14 +16801,14 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -16595,7 +16821,9 @@ 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
++ 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
+@@ -16604,9 +16832,10 @@ fi
+
+ fi
+
+- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ 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 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -16616,13 +16845,14 @@ 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
++ (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
+@@ -16650,11 +16880,11 @@ fi
+ if test "${enable_werror+set}" = set; then :
+ enableval=$enable_werror; enable_werror="$enableval"
+ else
+- enable_werror=yes
++ enable_werror=no
+
+ fi
+
+-if test x"$enable_werror" != "xno"; then :
++if test x"$enable_werror" == "xyes"; then :
+
+ CXXFLAGS="$CXXFLAGS -Werror"
+
+@@ -16936,13 +17166,6 @@ fi
+
+ 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 :
+@@ -16950,19 +17173,19 @@ if ${boost_cv_lib_iostreams+:} false; th
+ 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"
+@@ -16993,21 +17216,22 @@ fi
+ rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# Don't bother to ident the following nested for loops, only the 2
++# innermost ones matter.
++for boost_lib_ in iostreams; 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_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_
++ 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;;
++ (*@$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.
+@@ -17017,14 +17241,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # 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)
++ (*?*:*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
+@@ -17053,11 +17280,11 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -17076,17 +17303,22 @@ rm -f core conftest.err conftest_ipa8_co
+ 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
+- 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
++ 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
+ 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
+@@ -17109,14 +17341,14 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -17129,7 +17361,9 @@ 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
++ 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
+@@ -17138,9 +17372,10 @@ fi
+
+ fi
+
+- boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ test x"$boost_ldpath" != x &&
++ boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+ boost_cv_lib_iostreams_LDPATH="$boost_ldpath"
+- break 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -17150,13 +17385,14 @@ done
+ 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
+@@ -17221,13 +17457,6 @@ fi
+
+ 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 program_options library" >&5
+ $as_echo_n "checking for the Boost program_options library... " >&6; }
+ if ${boost_cv_lib_program_options+:} false; then :
+@@ -17235,19 +17464,19 @@ if ${boost_cv_lib_program_options+:} fal
+ 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=;;
++ (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"
+@@ -17278,21 +17507,22 @@ fi
+ rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# 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_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_
++ 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;;
++ (*@$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.
+@@ -17302,14 +17532,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # 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)
++ (*?*:*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.
++ (*) # No: use -lboost_foo to find the shared library.
+ boost_cv_lib_program_options_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+@@ -17338,11 +17571,11 @@ $as_echo "$ac_try_echo"; } >&5
+ 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_program_options=yes
+ else
+@@ -17361,17 +17594,22 @@ rm -f core conftest.err conftest_ipa8_co
+ 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
++ # 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
+- 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
++ 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
+@@ -17394,14 +17632,14 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -17414,7 +17652,9 @@ 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
++ 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
+@@ -17423,9 +17663,10 @@ fi
+
+ fi
+
+- boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ 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 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -17435,13 +17676,14 @@ 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
++ (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
+@@ -17465,7 +17707,7 @@ fi
+ # 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
++ 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
+@@ -17505,13 +17747,6 @@ fi
+
+ 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 system library" >&5
+ $as_echo_n "checking for the Boost system library... " >&6; }
+ if ${boost_cv_lib_system+:} false; then :
+@@ -17519,19 +17754,19 @@ if ${boost_cv_lib_system+:} false; then
+ 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=;;
++ (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"
+@@ -17562,21 +17797,22 @@ fi
+ rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# 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_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_
++ 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;;
++ (*@$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.
+@@ -17586,14 +17822,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # 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)
++ (*?*:*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.
++ (*) # No: use -lboost_foo to find the shared library.
+ boost_cv_lib_system_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+@@ -17622,11 +17861,11 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+ else
+@@ -17645,17 +17884,22 @@ rm -f core conftest.err conftest_ipa8_co
+ 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
++ # 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
+- 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
++ 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
+@@ -17678,14 +17922,14 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -17698,7 +17942,9 @@ 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
++ 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
+@@ -17707,9 +17953,10 @@ fi
+
+ fi
+
+- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ 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 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -17719,13 +17966,14 @@ 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
++ (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
+@@ -17790,13 +18038,6 @@ fi
+
+ 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 filesystem library" >&5
+ $as_echo_n "checking for the Boost filesystem library... " >&6; }
+ if ${boost_cv_lib_filesystem+:} false; then :
+@@ -17804,19 +18045,19 @@ if ${boost_cv_lib_filesystem+:} false; t
+ else
+ 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"
+@@ -17847,21 +18088,22 @@ fi
+ rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# Don't bother to ident the following nested for loops, only the 2
++# innermost ones matter.
++for boost_lib_ in filesystem; 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_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_
++ 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;;
++ (*@$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.
+@@ -17871,14 +18113,17 @@ for boost_rtopt_ in $boost_rtopt '' -d;
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # 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)
++ (*?*:*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.
++ (*) # No: use -lboost_foo to find the shared library.
+ boost_cv_lib_filesystem_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+@@ -17907,11 +18152,11 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+ else
+@@ -17930,17 +18175,22 @@ rm -f core conftest.err conftest_ipa8_co
+ 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
++ # 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
+- 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
++ 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
+ 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
+@@ -17963,14 +18213,14 @@ $as_echo "$ac_try_echo"; } >&5
+ 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
+@@ -17983,7 +18233,9 @@ 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
++ 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
+@@ -17992,9 +18244,10 @@ fi
+
+ fi
+
+- boost_cv_lib_filesystem_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ 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 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -18004,13 +18257,14 @@ done
+ 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
++ (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
+@@ -18029,13 +18283,298 @@ 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"
+-
++ 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;}
++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 <boost/system/error_code.hpp>
++
++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
++
++
++
+
+ fi
+
+@@ -19998,7 +20537,7 @@ $as_echo "$as_me: executing $ac_file com
+
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # Older Autoconf 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
+@@ -20049,7 +20588,7 @@ $as_echo X"$mf" |
+ 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
More information about the Libreoffice-commits
mailing list