diff --git a/cmis-client.changes b/cmis-client.changes index 7d5c162..c785928 100644 --- a/cmis-client.changes +++ b/cmis-client.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed May 6 15:05:04 UTC 2015 - coolo@suse.com + +- fix-boost-with-gcc5.patch: upsream patch to support gcc5 + +------------------------------------------------------------------- +Wed May 6 14:56:37 UTC 2015 - coolo@suse.com + +- use upstream source url + ------------------------------------------------------------------- Sat Dec 27 16:31:25 UTC 2014 - p.drouand@gmail.com diff --git a/cmis-client.spec b/cmis-client.spec index 7012aaf..0e85744 100644 --- a/cmis-client.spec +++ b/cmis-client.spec @@ -1,7 +1,7 @@ # # spec file for package cmis-client # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,8 @@ Summary: Sample CMIS client License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://sourceforge.net/projects/libcmis/ -Source0: %{_name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/project/libcmis/%{_name}-%{version}.tar.gz +Patch0: fix-boost-with-gcc5.patch BuildRequires: boost-devel >= 1.42 BuildRequires: docbook2X @@ -34,6 +35,7 @@ BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libcppunit-devel BuildRequires: libcurl-devel +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: pkg-config @@ -80,6 +82,8 @@ This allows C applications to connect to any CMIS-enabled repositories. It is on %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 +autoreconf -f -i %build export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)" diff --git a/fix-boost-with-gcc5.patch b/fix-boost-with-gcc5.patch new file mode 100644 index 0000000..c4a6332 --- /dev/null +++ b/fix-boost-with-gcc5.patch @@ -0,0 +1,3037 @@ +Index: libcmis-0.5.0/configure +=================================================================== +--- libcmis-0.5.0.orig/configure ++++ libcmis-0.5.0/configure +@@ -633,8 +633,11 @@ am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS + BOOST_PROGRAM_OPTIONS_LIBS ++BOOST_PROGRAM_OPTIONS_LDPATH + BOOST_PROGRAM_OPTIONS_LDFLAGS + BOOST_DATE_TIME_LIBS ++BOOST_LDPATH ++BOOST_DATE_TIME_LDPATH + BOOST_DATE_TIME_LDFLAGS + BOOST_CPPFLAGS + DISTCHECK_CONFIGURE_FLAGS +@@ -1474,7 +1477,7 @@ Optional Packages: + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + --without-man Do not build manpage +- --with-boost=DIR prefix of Boost [guess] ++ --with-boost=DIR prefix of Boost 1.36 [guess] + + Some influential environment variables: + CC C compiler command +@@ -2457,7 +2460,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-am__api_version='1.13' ++am__api_version='1.15' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2658,8 +2661,8 @@ test "$program_suffix" != NONE && + ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' + program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` ++# Expand $ac_aux_dir to an absolute path. ++am_aux_dir=`cd "$ac_aux_dir" && pwd` + + if test x"${MISSING+set}" != xset; then + case $am_aux_dir in +@@ -2678,7 +2681,7 @@ else + $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + fi + +-if test x"${install_sh}" != xset; then ++if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +@@ -3006,8 +3009,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma + # + mkdir_p='$(MKDIR_P)' + +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. ++# We need awk for the "check" target (and possibly the TAP driver). 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}' +@@ -3023,6 +3026,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' + + + ++# 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; +@@ -3852,6 +3897,65 @@ 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 ++ ++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=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 ++ + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" +@@ -16141,14 +16245,15 @@ fi + + + +-echo "$as_me: this is boost.m4 serial 12" >&5 ++echo "$as_me: this is boost.m4 serial 24" >&5 + boost_save_IFS=$IFS +-boost_version_req= ++boost_version_req=1.36 + IFS=. + set x $boost_version_req 0 0 0 + IFS=$boost_save_IFS + shift + boost_version_req=`expr "$1" '*' 100000 + "$2" '*' 100 + "$3"` ++boost_version_req_string=$1.$2.$3 + + # Check whether --with-boost was given. + if test "${with_boost+set}" = set; then : +@@ -16167,10 +16272,9 @@ $as_echo "$as_me: Detected BOOST_ROOT=$B + fi + fi + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'" +- + boost_save_CPPFLAGS=$CPPFLAGS +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req" >&5 +-$as_echo_n "checking for Boost headers version >= $boost_version_req... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req_string" >&5 ++$as_echo_n "checking for Boost headers version >= $boost_version_req_string... " >&6; } + if ${boost_cv_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 + else +@@ -16265,7 +16369,7 @@ fi + $as_echo "$boost_cv_inc_path" >&6; } + case $boost_cv_inc_path in #( + no) +- boost_errmsg="cannot find Boost headers version >= $boost_version_req" ++ boost_errmsg="cannot find Boost headers version >= $boost_version_req_string" + as_fn_error $? "$boost_errmsg" "$LINENO" 5 + + ;;#( +@@ -16274,7 +16378,6 @@ $as_echo "$boost_cv_inc_path" >&6; } + ;;#( + *) + BOOST_CPPFLAGS="-I$boost_cv_inc_path" +- + ;; + esac + if test x"$boost_cv_inc_path" != xno; then +@@ -16286,17 +16389,29 @@ $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-lib-version = BOOST_LIB_VERSION + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ grep -v '#' | + tr -d '\r' | +- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;g;}" >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 +@@ -16305,7 +16420,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 +@@ -16336,11 +16451,54 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + # 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). +- # TODO: Move the test on GCC 4.4 up once it's released. + 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 \ +@@ -16357,7 +16515,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + "defined __ICC && (defined __unix || defined ) @ il" \ + "defined __ICL @ iw" \ + "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ +- "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc44" \ + "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" \ +@@ -16428,6 +16585,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. */ + +@@ -16451,6 +16613,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 date_time library" >&5 +@@ -16492,13 +16659,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 date_time library" >&5 + $as_echo_n "checking for the Boost date_time library... " >&6; } + if ${boost_cv_lib_date_time+:} false; then : +@@ -16506,19 +16666,19 @@ if ${boost_cv_lib_date_time+:} false; th + else + boost_cv_lib_date_time=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" +@@ -16549,38 +16709,42 @@ 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 date_time; 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_date_time$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_date_time$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_date_time$boost_tag_$boost_mt_$boost_ver_ \ +- boost_date_time$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. + 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 /usr/lib64 /lib64 ++ /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_date_time_LIBS="$boost_ldpath/lib$boost_lib.$libext" + test -e "$boost_cv_lib_date_time_LIBS" || continue;; #( +- *) # No: use -lboost_foo to find the shared library. ++ (*) # No: use -lboost_foo to find the shared library. + boost_cv_lib_date_time_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +@@ -16609,11 +16773,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_date_time=yes + else +@@ -16632,8 +16796,79 @@ rm -f core conftest.err conftest_ipa8_co + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS + if test x"$boost_cv_lib_date_time" = xyes; then +- boost_cv_lib_date_time_LDFLAGS="-L$boost_ldpath -R$boost_ldpath" +- break 6 ++ # 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_date_time_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_date_time_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ boost_cv_lib_date_time_LDPATH="$boost_ldpath" ++ break 7 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -16643,22 +16878,23 @@ done + done + done + done ++done # boost_lib_ + rm -f conftest.$ac_objext + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_date_time" >&5 + $as_echo "$boost_cv_lib_date_time" >&6; } + case $boost_cv_lib_date_time 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 not find the flags to link with Boost date_time" "$LINENO" 5 ++ as_fn_error $? "cannot find the flags to link with Boost date_time" "$LINENO" 5 + ;; + esac + BOOST_DATE_TIME_LDFLAGS=$boost_cv_lib_date_time_LDFLAGS +- ++BOOST_DATE_TIME_LDPATH=$boost_cv_lib_date_time_LDPATH ++BOOST_LDPATH=$boost_cv_lib_date_time_LDPATH + BOOST_DATE_TIME_LIBS=$boost_cv_lib_date_time_LIBS +- + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -16668,6 +16904,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi + + ++ + if test x"$boost_cv_inc_path" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/scoped_ptr.hpp" >&5 + $as_echo "$as_me: Boost not available, not searching for boost/scoped_ptr.hpp" >&6;} +@@ -16727,6 +16964,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi + + ++ + if test x"$boost_cv_inc_path" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/uuid/uuid.hpp" >&5 + $as_echo "$as_me: Boost not available, not searching for boost/uuid/uuid.hpp" >&6;} +@@ -16756,93 +16994,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXX + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi + +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/uuid/uuid_generators.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/uuid/uuid_generators.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/uuid/uuid_generators.hpp" "ac_cv_header_boost_uuid_uuid_generators_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_uuid_uuid_generators_hpp" = xyes; then : +- +-$as_echo "#define HAVE_BOOST_UUID_UUID_GENERATORS_HPP 1" >>confdefs.h +- +-else +- as_fn_error $? "cannot find boost/uuid/uuid_generators.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 +- +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/uuid/uuid_io.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/uuid/uuid_io.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/uuid/uuid_io.hpp" "ac_cv_header_boost_uuid_uuid_io_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_uuid_uuid_io_hpp" = xyes; then : +- +-$as_echo "#define HAVE_BOOST_UUID_UUID_IO_HPP 1" >>confdefs.h +- +-else +- as_fn_error $? "cannot find boost/uuid/uuid_io.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 +- +-if test x"$boost_cv_inc_path" = xno; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/uuid/uuid_serialize.hpp" >&5 +-$as_echo "$as_me: Boost not available, not searching for boost/uuid/uuid_serialize.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/uuid/uuid_serialize.hpp" "ac_cv_header_boost_uuid_uuid_serialize_hpp" "$ac_includes_default" +-if test "x$ac_cv_header_boost_uuid_uuid_serialize_hpp" = xyes; then : +- +-$as_echo "#define HAVE_BOOST_UUID_UUID_SERIALIZE_HPP 1" >>confdefs.h +- +-else +- as_fn_error $? "cannot find boost/uuid/uuid_serialize.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 +- + + + if test "x$enable_client" != "xno"; then : +@@ -16887,13 +17038,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 : +@@ -16901,19 +17045,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" +@@ -16944,38 +17088,42 @@ 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. + 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 /usr/lib64 /lib64 ++ /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 +@@ -17004,11 +17152,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 +@@ -17027,8 +17175,79 @@ 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 +- boost_cv_lib_program_options_LDFLAGS="-L$boost_ldpath -R$boost_ldpath" +- break 6 ++ # 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 +@@ -17038,22 +17257,23 @@ 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 not find the flags to link with Boost program_options" "$LINENO" 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 +- + CPPFLAGS=$boost_save_CPPFLAGS + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -17064,6 +17284,7 @@ fi + + + ++ + fi + + +Index: libcmis-0.5.0/configure.ac +=================================================================== +--- libcmis-0.5.0.orig/configure.ac ++++ libcmis-0.5.0/configure.ac +@@ -164,6 +164,7 @@ AS_IF([test "x$enable_tests" != "xno"], + # Check for boost + m4_pattern_allow([^BOOST_]) + ++BOOST_REQUIRE([1.36]) + BOOST_DATE_TIME + BOOST_SMART_PTR + BOOST_UUID +Index: libcmis-0.5.0/m4/boost.m4 +=================================================================== +--- libcmis-0.5.0.orig/m4/boost.m4 ++++ libcmis-0.5.0/m4/boost.m4 +@@ -1,5 +1,5 @@ + # boost.m4: Locate Boost headers and libraries for autoconf-based projects. +-# Copyright (C) 2007, 2008, 2009 Benoit Sigoure ++# Copyright (C) 2007-2011, 2014 Benoit Sigoure + # + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -22,7 +22,7 @@ + # along with this program. If not, see . + + m4_define([_BOOST_SERIAL], [m4_translit([ +-# serial 12 ++# serial 24 + ], [# + ], [])]) + +@@ -45,17 +45,22 @@ m4_define([_BOOST_SERIAL], [m4_translit( + # Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry, + # simply read the README, it will show you what to do step by step. + +-m4_pattern_forbid([^_?BOOST_]) ++m4_pattern_forbid([^_?(BOOST|Boost)_]) + + + # _BOOST_SED_CPP(SED-PROGRAM, PROGRAM, + # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # -------------------------------------------------------- + # Same as AC_EGREP_CPP, but leave the result in conftest.i. +-# PATTERN is *not* overquoted, as in AC_EGREP_CPP. It could be useful +-# to turn this into a macro which extracts the value of any macro. ++# ++# SED-PROGRAM is *not* overquoted, as in AC_EGREP_CPP. It is expanded ++# in double-quotes, so escape your double quotes. ++# ++# It could be useful to turn this into a macro which extracts the ++# value of any macro. + m4_define([_BOOST_SED_CPP], +-[AC_LANG_PREPROC_REQUIRE()dnl ++[AC_LANG_PUSH([C++])dnl ++AC_LANG_PREPROC_REQUIRE()dnl + AC_REQUIRE([AC_PROG_SED])dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) + AS_IF([dnl eval is necessary to expand ac_cpp. +@@ -67,13 +72,31 @@ dnl strip `\n' with backquotes, not the + dnl boost_cv_lib_version='1_37\r' for instance, which breaks + dnl everything else. + dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK ++dnl ++dnl Beware that GCC 5, when expanding macros, may embed # line directives ++dnl a within single line: ++dnl ++dnl # 1 "conftest.cc" ++dnl # 1 "" ++dnl # 1 "" ++dnl # 1 "conftest.cc" ++dnl # 1 "/opt/local/include/boost/version.hpp" 1 3 ++dnl # 2 "conftest.cc" 2 ++dnl boost-lib-version = ++dnl # 2 "conftest.cc" 3 ++dnl "1_56" ++dnl ++dnl So get rid of the # lines, and glue the remaining ones together. + (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | ++ grep -v '#' | + tr -d '\r' | ++ tr -s '\n' ' ' | + $SED -n -e "$1" >conftest.i 2>&1], + [$3], + [$4]) + rm -rf conftest* +-])# AC_EGREP_CPP ++AC_LANG_POP([C++])dnl ++])# _BOOST_SED_CPP + + + +@@ -98,6 +121,7 @@ set x $boost_version_req 0 0 0 + IFS=$boost_save_IFS + shift + boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"` ++boost_version_req_string=$[1].$[2].$[3] + AC_ARG_WITH([boost], + [AS_HELP_STRING([--with-boost=DIR], + [prefix of Boost $1 @<:@guess@:>@])])dnl +@@ -113,9 +137,9 @@ if test x"$BOOST_ROOT" != x; then + fi + fi + AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], +- ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"]) ++ ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])dnl + boost_save_CPPFLAGS=$CPPFLAGS +- AC_CACHE_CHECK([for Boost headers version >= $boost_version_req], ++ AC_CACHE_CHECK([for Boost headers version >= $boost_version_req_string], + [boost_cv_inc_path], + [boost_cv_inc_path=no + AC_LANG_PUSH([C++])dnl +@@ -183,7 +207,7 @@ AC_LANG_POP([C++])dnl + ]) + case $boost_cv_inc_path in #( + no) +- boost_errmsg="cannot find Boost headers version >= $boost_version_req" ++ boost_errmsg="cannot find Boost headers version >= $boost_version_req_string" + m4_if([$2], [], [AC_MSG_ERROR([$boost_errmsg])], + [AC_MSG_NOTICE([$boost_errmsg])]) + $2 +@@ -192,7 +216,7 @@ AC_LANG_POP([C++])dnl + BOOST_CPPFLAGS= + ;;#( + *) +- AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"]) ++ AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])dnl + ;; + esac + if test x"$boost_cv_inc_path" != xno; then +@@ -201,7 +225,7 @@ AC_LANG_POP([C++])dnl + AC_CACHE_CHECK([for Boost's header version], + [boost_cv_lib_version], + [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl +- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}], ++ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]], + [#include + boost-lib-version = BOOST_LIB_VERSION], + [boost_cv_lib_version=`cat conftest.i`])]) +@@ -209,24 +233,26 @@ boost-lib-version = BOOST_LIB_VERSION], + boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` + case $boost_major_version in #( + '' | *[[!0-9]]*) +- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version]) ++ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version']) + ;; + esac + fi + CPPFLAGS=$boost_save_CPPFLAGS + ])# BOOST_REQUIRE + ++ + # BOOST_STATIC() + # -------------- + # Add the "--enable-static-boost" configure argument. If this argument is given + # on the command line, static versions of the libraries will be looked up. + AC_DEFUN([BOOST_STATIC], + [AC_ARG_ENABLE([static-boost], +- [AC_HELP_STRING([--enable-static-boost], ++ [AS_HELP_STRING([--enable-static-boost], + [Prefer the static boost libraries over the shared ones [no]])], + [enable_static_boost=yes], + [enable_static_boost=no])])# BOOST_STATIC + ++ + # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) + # -------------------------------------------------------------------------- + # Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for +@@ -259,14 +285,16 @@ fi + ])# BOOST_FIND_HEADER + + +-# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], +-# [CXX-PROLOGUE]) +-# ------------------------------------------------------------------------- +-# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for +-# libboost_thread). Check that HEADER-NAME works and check that +-# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument +-# CXX-PROLOGUE can be used to include some C++ code before the `main' +-# function. ++# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES], ++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], ++# [CXX-PROLOGUE]) ++# -------------------------------------------------------------- ++# Look for the Boost library COMPONENT-NAME (e.g., `thread', for ++# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g., ++# "thread_win32 thread"). Check that HEADER-NAME works and check that ++# libboost_LIB-NAME can link with the code CXX-TEST. The optional ++# argument CXX-PROLOGUE can be used to include some C++ code before ++# the `main' function. + # + # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above). + # +@@ -280,7 +308,7 @@ fi + # builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp + # ... If you want to make sure you have a specific version of Boost + # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro. +-AC_DEFUN([BOOST_FIND_LIB], ++AC_DEFUN([BOOST_FIND_LIBS], + [AC_REQUIRE([BOOST_REQUIRE])dnl + AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl + AC_REQUIRE([BOOST_STATIC])dnl +@@ -292,33 +320,71 @@ dnl The else branch is huge and wasn't i + AC_LANG_PUSH([C++])dnl + AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl + AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl ++AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl + AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl +-BOOST_FIND_HEADER([$3]) ++BOOST_FIND_HEADER([$4]) + 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). + AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], +- [Boost_lib=no +- case "$2" in #( +- mt | mt-) boost_mt=-mt; boost_rtopt=;; #( +- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #( +- *) boost_mt=; boost_rtopt=$2;; ++ [_BOOST_FIND_LIBS($@)]) ++case $Boost_lib in #( ++ (no) _AC_MSG_LOG_CONFTEST ++ AC_MSG_ERROR([cannot find the flags to link with Boost $1]) ++ ;; ++esac ++AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl ++AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl ++AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl ++AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl ++CPPFLAGS=$boost_save_CPPFLAGS ++AS_VAR_POPDEF([Boost_lib])dnl ++AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl ++AS_VAR_POPDEF([Boost_lib_LDPATH])dnl ++AS_VAR_POPDEF([Boost_lib_LIBS])dnl ++AC_LANG_POP([C++])dnl ++fi ++]) ++ ++ ++# BOOST_FIND_LIB([LIB-NAME], ++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], ++# [CXX-PROLOGUE]) ++# -------------------------------------------------------------- ++# Backward compatibility wrapper for BOOST_FIND_LIBS. ++AC_DEFUN([BOOST_FIND_LIB], ++[BOOST_FIND_LIBS([$1], $@)]) ++ ++ ++# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES], ++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], ++# [CXX-PROLOGUE]) ++# -------------------------------------------------------------- ++# Real implementation of BOOST_FIND_LIBS: rely on these local macros: ++# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS ++# ++# 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_thread.dylib ++# doesn't exist but there's -obviously- libboost_thread-mt.dylib). ++AC_DEFUN([_BOOST_FIND_LIBS], ++[Boost_lib=no ++ case "$3" in #( ++ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( ++ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #( ++ (*) boost_mt=; boost_rtopt=$3;; + 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" +@@ -329,8 +395,8 @@ AC_CACHE_CHECK([for the Boost $1 library + AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?]) + boost_save_ac_objext=$ac_objext + # Generate the test file. +- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3> +-$5], [$4])]) ++ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4> ++$6], [$5])]) + dnl Optimization hacks: compiling C++ is slow, especially with Boost. What + dnl we're trying to do here is guess the right combination of link flags + dnl (LIBS / LDFLAGS) to use a given library. This can take several +@@ -352,38 +418,42 @@ dnl start the for loops). + [AC_MSG_ERROR([cannot compile a test that uses Boost $1])]) + 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 $2; 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_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$1$boost_tag_$boost_mt_$boost_ver_ \ +- boost_$1$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. + 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 /usr/lib64 /lib64 ++ /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_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext" + test -e "$Boost_lib_LIBS" || continue;; #( +- *) # No: use -lboost_foo to find the shared library. ++ (*) # No: use -lboost_foo to find the shared library. + Boost_lib_LIBS="-l$boost_lib";; + esac + boost_save_LIBS=$LIBS +@@ -397,8 +467,35 @@ dnl generated only once above (before we + LDFLAGS=$boost_save_LDFLAGS + LIBS=$boost_save_LIBS + if test x"$Boost_lib" = xyes; then +- Boost_lib_LDFLAGS="-L$boost_ldpath -R$boost_ldpath" +- break 6 ++ # 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 ++ AC_CACHE_VAL([boost_cv_rpath_link_ldflag], ++ [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_lib_LIBS" ++ _BOOST_AC_LINK_IFELSE([], ++ [boost_rpath_link_ldflag_found=yes ++ break], ++ [boost_rpath_link_ldflag_found=no]) ++ done ++ ;; ++ esac ++ AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"], ++ [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])]) ++ LDFLAGS=$boost_save_LDFLAGS ++ LIBS=$boost_save_LIBS ++ ]) ++ test x"$boost_ldpath" != x && ++ Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" ++ Boost_lib_LDPATH="$boost_ldpath" ++ break 7 + else + boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi +@@ -408,22 +505,10 @@ done + done + done + done ++done # boost_lib_ + rm -f conftest.$ac_objext + ]) +-case $Boost_lib in #( +- no) _AC_MSG_LOG_CONFTEST +- AC_MSG_ERROR([cannot not find the flags to link with Boost $1]) +- ;; +-esac +-AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS]) +-AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS]) +-CPPFLAGS=$boost_save_CPPFLAGS +-AS_VAR_POPDEF([Boost_lib])dnl +-AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl +-AS_VAR_POPDEF([Boost_lib_LIBS])dnl +-AC_LANG_POP([C++])dnl +-fi +-])# BOOST_FIND_LIB ++ + + + # --------------------------------------- # +@@ -434,42 +519,155 @@ fi + # The page http://beta.boost.org/doc/libs is useful: it gives the first release + # version of each library (among other things). + ++# BOOST_DEFUN(LIBRARY, CODE) ++# -------------------------- ++# Define BOOST_ as a macro that runs CODE. ++# ++# Use indir to avoid the warning on underquoted macro name given to AC_DEFUN. ++m4_define([BOOST_DEFUN], ++[m4_indir([AC_DEFUN], ++ m4_toupper([BOOST_$1]), ++[m4_pushdef([BOOST_Library], [$1])dnl ++$2 ++m4_popdef([BOOST_Library])dnl ++]) ++]) ++ + # BOOST_ARRAY() + # ------------- + # Look for Boost.Array +-AC_DEFUN([BOOST_ARRAY], ++BOOST_DEFUN([Array], + [BOOST_FIND_HEADER([boost/array.hpp])]) + + + # BOOST_ASIO() + # ------------ + # Look for Boost.Asio (new in Boost 1.35). +-AC_DEFUN([BOOST_ASIO], ++BOOST_DEFUN([Asio], + [AC_REQUIRE([BOOST_SYSTEM])dnl + BOOST_FIND_HEADER([boost/asio.hpp])]) + + + # BOOST_BIND() + # ------------ +-# Look for Boost.Bind +-AC_DEFUN([BOOST_BIND], ++# Look for Boost.Bind. ++BOOST_DEFUN([Bind], + [BOOST_FIND_HEADER([boost/bind.hpp])]) + + ++# BOOST_CHRONO() ++# -------------- ++# Look for Boost.Chrono. ++BOOST_DEFUN([Chrono], ++[# 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 ++ BOOST_SYSTEM([$1]) ++fi # end of the Boost.System check. ++boost_filesystem_save_LIBS=$LIBS ++boost_filesystem_save_LDFLAGS=$LDFLAGS ++m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl ++LIBS="$LIBS $BOOST_SYSTEM_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++BOOST_FIND_LIB([chrono], [$1], ++ [boost/chrono.hpp], ++ [boost::chrono::thread_clock d;]) ++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 ++])# BOOST_CHRONO ++ ++ ++# BOOST_CONTEXT([PREFERRED-RT-OPT]) ++# ----------------------------------- ++# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost ++# 1.51.0 ++BOOST_DEFUN([Context], ++[BOOST_FIND_LIB([context], [$1], ++ [boost/context/all.hpp],[[ ++// creates a stack ++void * stack_pointer = new void*[4096]; ++std::size_t const size = sizeof(void*[4096]); ++ ++// context fc uses f() as context function ++// fcontext_t is placed on top of context stack ++// a pointer to fcontext_t is returned ++fc = ctx::make_fcontext(stack_pointer, size, f); ++return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl ++namespace ctx = boost::context; ++// context ++static ctx::fcontext_t fcm, *fc; ++// context-function ++static void f(intptr_t i) { ++ ctx::jump_fcontext(fc, &fcm, i * 2); ++}]) ++])# BOOST_CONTEXT ++ ++ + # BOOST_CONVERSION() + # ------------------ + # Look for Boost.Conversion (cast / lexical_cast) +-AC_DEFUN([BOOST_CONVERSION], ++BOOST_DEFUN([Conversion], + [BOOST_FIND_HEADER([boost/cast.hpp]) + BOOST_FIND_HEADER([boost/lexical_cast.hpp]) + ])# BOOST_CONVERSION + + ++# BOOST_COROUTINE([PREFERRED-RT-OPT]) ++# ----------------------------------- ++# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost ++# 1.53.0 ++BOOST_DEFUN([Coroutine], ++[ ++boost_coroutine_save_LIBS=$LIBS ++boost_coroutine_save_LDFLAGS=$LDFLAGS ++# Link-time dependency from coroutine to context ++BOOST_CONTEXT([$1]) ++# Starting from Boost 1.55 a dependency on Boost.System is added ++if test $boost_major_version -ge 155; then ++ BOOST_SYSTEM([$1]) ++fi ++m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)]) ++LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS" ++ ++BOOST_FIND_LIB([coroutine], [$1], ++ [boost/coroutine/coroutine.hpp], ++ [boost::coroutines::coroutine< int(int) > coro; coro.empty();]) ++ ++# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54 ++# coroutine doesn't use context from its headers but from its library. ++if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then ++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS" ++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS" ++fi ++if test $enable_static_boost = yes && test $boost_major_version -ge 155; then ++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS" ++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++fi ++LIBS=$boost_coroutine_save_LIBS ++LDFLAGS=$boost_coroutine_save_LDFLAGS ++])# BOOST_COROUTINE ++ ++ ++# BOOST_CRC() ++# ----------- ++# Look for Boost.CRC ++BOOST_DEFUN([CRC], ++[BOOST_FIND_HEADER([boost/crc.hpp]) ++])# BOOST_CRC ++ ++ + # BOOST_DATE_TIME([PREFERRED-RT-OPT]) + # ----------------------------------- + # Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_DATE_TIME], ++BOOST_DEFUN([Date_Time], + [BOOST_FIND_LIB([date_time], [$1], + [boost/date_time/posix_time/posix_time.hpp], + [boost::posix_time::ptime t;]) +@@ -482,12 +680,12 @@ AC_DEFUN([BOOST_DATE_TIME], + # the documentation of BOOST_FIND_LIB above. + # Do not check for boost/filesystem.hpp because this file was introduced in + # 1.34. +-AC_DEFUN([BOOST_FILESYSTEM], ++BOOST_DEFUN([Filesystem], + [# 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 +-BOOST_SYSTEM([$1]) ++ BOOST_SYSTEM([$1]) + fi # end of the Boost.System check. + boost_filesystem_save_LIBS=$LIBS + boost_filesystem_save_LDFLAGS=$LDFLAGS +@@ -496,71 +694,125 @@ LIBS="$LIBS $BOOST_SYSTEM_LIBS" + LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" + BOOST_FIND_LIB([filesystem], [$1], + [boost/filesystem/path.hpp], [boost::filesystem::path p;]) ++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 + ])# BOOST_FILESYSTEM + + ++# BOOST_FLYWEIGHT() ++# ----------------- ++# Look for Boost.Flyweight. ++BOOST_DEFUN([Flyweight], ++[dnl There's a hidden dependency on pthreads. ++AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl ++BOOST_FIND_HEADER([boost/flyweight.hpp]) ++AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag]) ++]) ++ ++ + # BOOST_FOREACH() + # --------------- +-# Look for Boost.Foreach +-AC_DEFUN([BOOST_FOREACH], ++# Look for Boost.Foreach. ++BOOST_DEFUN([Foreach], + [BOOST_FIND_HEADER([boost/foreach.hpp])]) + + + # BOOST_FORMAT() + # -------------- +-# Look for Boost.Format ++# Look for Boost.Format. + # Note: we can't check for boost/format/format_fwd.hpp because the header isn't + # standalone. It can't be compiled because it triggers the following error: + # boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std' + # does not name a type +-AC_DEFUN([BOOST_FORMAT], ++BOOST_DEFUN([Format], + [BOOST_FIND_HEADER([boost/format.hpp])]) + + + # BOOST_FUNCTION() + # ---------------- + # Look for Boost.Function +-AC_DEFUN([BOOST_FUNCTION], ++BOOST_DEFUN([Function], + [BOOST_FIND_HEADER([boost/function.hpp])]) + + ++# BOOST_GEOMETRY() ++# ---------------- ++# Look for Boost.Geometry (new since 1.47.0). ++BOOST_DEFUN([Geometry], ++[BOOST_FIND_HEADER([boost/geometry.hpp]) ++])# BOOST_GEOMETRY ++ ++ + # BOOST_GRAPH([PREFERRED-RT-OPT]) + # ------------------------------- + # Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_GRAPH], ++BOOST_DEFUN([Graph], + [BOOST_FIND_LIB([graph], [$1], + [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;]) + ])# BOOST_GRAPH + + + # BOOST_IOSTREAMS([PREFERRED-RT-OPT]) +-# ------------------------------- ++# ----------------------------------- + # Look for Boost.IOStreams. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_IOSTREAMS], ++BOOST_DEFUN([IOStreams], + [BOOST_FIND_LIB([iostreams], [$1], + [boost/iostreams/device/file_descriptor.hpp], +- [boost::iostreams::file_descriptor fd(0); fd.close();]) ++ [boost::iostreams::file_descriptor fd; fd.close();]) + ])# BOOST_IOSTREAMS + + + # BOOST_HASH() + # ------------ + # Look for Boost.Functional/Hash +-AC_DEFUN([BOOST_HASH], ++BOOST_DEFUN([Hash], + [BOOST_FIND_HEADER([boost/functional/hash.hpp])]) + + + # BOOST_LAMBDA() + # -------------- + # Look for Boost.Lambda +-AC_DEFUN([BOOST_LAMBDA], ++BOOST_DEFUN([Lambda], + [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) + + ++# BOOST_LOCALE() ++# -------------- ++# Look for Boost.Locale ++BOOST_DEFUN([Locale], ++[BOOST_FIND_LIB([locale], [$1], ++ [boost/locale.hpp], ++ [[boost::locale::generator gen; std::locale::global(gen(""));]]) ++])# BOOST_LOCALE ++ ++# BOOST_LOG([PREFERRED-RT-OPT]) ++# ----------------------------- ++# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. ++BOOST_DEFUN([Log], ++[BOOST_FIND_LIB([log], [$1], ++ [boost/log/core/core.hpp], ++ [boost::log::attribute a; a.get_value();]) ++])# BOOST_LOG ++ ++ ++# BOOST_LOG_SETUP([PREFERRED-RT-OPT]) ++# ----------------------------------- ++# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. ++BOOST_DEFUN([Log_Setup], ++[AC_REQUIRE([BOOST_LOG])dnl ++BOOST_FIND_LIB([log_setup], [$1], ++ [boost/log/utility/setup/from_settings.hpp], ++ [boost::log::basic_settings bs; bs.empty();]) ++])# BOOST_LOG_SETUP ++ ++ + # BOOST_MATH() + # ------------ + # Look for Boost.Math +@@ -569,21 +821,52 @@ AC_DEFUN([BOOST_LAMBDA], + # libboost_math_c99f, libboost_math_c99l, libboost_math_tr1, + # libboost_math_tr1f, libboost_math_tr1l). This macro must be fixed to do the + # right thing anyway. +-AC_DEFUN([BOOST_MATH], ++BOOST_DEFUN([Math], + [BOOST_FIND_HEADER([boost/math/special_functions.hpp])]) + + ++# BOOST_MPI([PREFERRED-RT-OPT]) ++# ------------------------------- ++# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is ++# set, otherwise tries CXX ++# ++BOOST_DEFUN([MPI], ++[boost_save_CXX=${CXX} ++boost_save_CXXCPP=${CXXCPP} ++if test x"${MPICXX}" != x; then ++ CXX=${MPICXX} ++ CXXCPP="${MPICXX} -E" ++fi ++BOOST_FIND_LIB([mpi], [$1], ++ [boost/mpi.hpp], ++ [int argc = 0; ++ char **argv = 0; ++ boost::mpi::environment env(argc,argv);]) ++CXX=${boost_save_CXX} ++CXXCPP=${boost_save_CXXCPP} ++])# BOOST_MPI ++ ++ + # BOOST_MULTIARRAY() + # ------------------ + # Look for Boost.MultiArray +-AC_DEFUN([BOOST_MULTIARRAY], ++BOOST_DEFUN([MultiArray], + [BOOST_FIND_HEADER([boost/multi_array.hpp])]) + + ++# BOOST_NUMERIC_UBLAS() ++# -------------------------- ++# Look for Boost.NumericUblas (Basic Linear Algebra) ++BOOST_DEFUN([Numeric_Ublas], ++[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp]) ++])# BOOST_NUMERIC_UBLAS ++ ++ + # BOOST_NUMERIC_CONVERSION() + # -------------------------- + # Look for Boost.NumericConversion (policy-based numeric conversion) +-AC_DEFUN([BOOST_NUMERIC_CONVERSION], ++BOOST_DEFUN([Numeric_Conversion], + [BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp]) + ])# BOOST_NUMERIC_CONVERSION + +@@ -591,32 +874,82 @@ AC_DEFUN([BOOST_NUMERIC_CONVERSION], + # BOOST_OPTIONAL() + # ---------------- + # Look for Boost.Optional +-AC_DEFUN([BOOST_OPTIONAL], ++BOOST_DEFUN([Optional], + [BOOST_FIND_HEADER([boost/optional.hpp])]) + + + # BOOST_PREPROCESSOR() + # -------------------- + # Look for Boost.Preprocessor +-AC_DEFUN([BOOST_PREPROCESSOR], ++BOOST_DEFUN([Preprocessor], + [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])]) + + ++# BOOST_RANGE() ++# -------------------- ++# Look for Boost.Range ++BOOST_DEFUN([Range], ++[BOOST_FIND_HEADER([boost/range/adaptors.hpp])]) ++ ++# BOOST_UNORDERED() ++# ----------------- ++# Look for Boost.Unordered ++BOOST_DEFUN([Unordered], ++[BOOST_FIND_HEADER([boost/unordered_map.hpp])]) ++ ++ ++# BOOST_UUID() ++# ------------ ++# Look for Boost.Uuid ++BOOST_DEFUN([Uuid], ++[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])]) ++ ++ + # BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT]) + # ----------------------------------------- +-# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, see +-# the documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_PROGRAM_OPTIONS], ++# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, ++# see the documentation of BOOST_FIND_LIB above. ++BOOST_DEFUN([Program_Options], + [BOOST_FIND_LIB([program_options], [$1], + [boost/program_options.hpp], + [boost::program_options::options_description d("test");]) + ])# BOOST_PROGRAM_OPTIONS + + ++ ++# _BOOST_PYTHON_CONFIG(VARIABLE, FLAG) ++# ------------------------------------ ++# Save VARIABLE, and define it via `python-config --FLAG`. ++# Substitute BOOST_PYTHON_VARIABLE. ++m4_define([_BOOST_PYTHON_CONFIG], ++[AC_SUBST([BOOST_PYTHON_$1], ++ [`python-config --$2 2>/dev/null`])dnl ++boost_python_save_$1=$$1 ++$1="$$1 $BOOST_PYTHON_$1"]) ++ ++ ++# BOOST_PYTHON([PREFERRED-RT-OPT]) ++# -------------------------------- ++# Look for Boost.Python. For the documentation of PREFERRED-RT-OPT, ++# see the documentation of BOOST_FIND_LIB above. ++BOOST_DEFUN([Python], ++[_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes]) ++_BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags]) ++_BOOST_PYTHON_CONFIG([LIBS], [libs]) ++m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl ++BOOST_FIND_LIBS([python], [python python3], [$1], ++ [boost/python.hpp], ++ [], [BOOST_PYTHON_MODULE(empty) {}]) ++CPPFLAGS=$boost_python_save_CPPFLAGS ++LDFLAGS=$boost_python_save_LDFLAGS ++LIBS=$boost_python_save_LIBS ++])# BOOST_PYTHON ++ ++ + # BOOST_REF() + # ----------- + # Look for Boost.Ref +-AC_DEFUN([BOOST_REF], ++BOOST_DEFUN([Ref], + [BOOST_FIND_HEADER([boost/ref.hpp])]) + + +@@ -624,7 +957,7 @@ AC_DEFUN([BOOST_REF], + # ------------------------------- + # Look for Boost.Regex. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_REGEX], ++BOOST_DEFUN([Regex], + [BOOST_FIND_LIB([regex], [$1], + [boost/regex.hpp], + [boost::regex exp("*"); boost::regex_match("foo", exp);]) +@@ -635,29 +968,37 @@ AC_DEFUN([BOOST_REGEX], + # --------------------------------------- + # Look for Boost.Serialization. For the documentation of PREFERRED-RT-OPT, see + # the documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_SERIALIZATION], ++BOOST_DEFUN([Serialization], + [BOOST_FIND_LIB([serialization], [$1], + [boost/archive/text_oarchive.hpp], + [std::ostream* o = 0; // Cheap way to get an ostream... + boost::archive::text_oarchive t(*o);]) +-])# BOOST_SIGNALS ++])# BOOST_SERIALIZATION + + + # BOOST_SIGNALS([PREFERRED-RT-OPT]) + # --------------------------------- + # Look for Boost.Signals. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_SIGNALS], ++BOOST_DEFUN([Signals], + [BOOST_FIND_LIB([signals], [$1], + [boost/signal.hpp], + [boost::signal s;]) + ])# BOOST_SIGNALS + + ++# BOOST_SIGNALS2() ++# ---------------- ++# Look for Boost.Signals2 (new since 1.39.0). ++BOOST_DEFUN([Signals2], ++[BOOST_FIND_HEADER([boost/signals2.hpp]) ++])# BOOST_SIGNALS2 ++ ++ + # BOOST_SMART_PTR() + # ----------------- + # Look for Boost.SmartPtr +-AC_DEFUN([BOOST_SMART_PTR], ++BOOST_DEFUN([Smart_Ptr], + [BOOST_FIND_HEADER([boost/scoped_ptr.hpp]) + BOOST_FIND_HEADER([boost/shared_ptr.hpp]) + ]) +@@ -666,14 +1007,14 @@ BOOST_FIND_HEADER([boost/shared_ptr.hpp] + # BOOST_STATICASSERT() + # -------------------- + # Look for Boost.StaticAssert +-AC_DEFUN([BOOST_STATICASSERT], ++BOOST_DEFUN([StaticAssert], + [BOOST_FIND_HEADER([boost/static_assert.hpp])]) + + + # BOOST_STRING_ALGO() + # ------------------- + # Look for Boost.StringAlgo +-AC_DEFUN([BOOST_STRING_ALGO], ++BOOST_DEFUN([String_Algo], + [BOOST_FIND_HEADER([boost/algorithm/string.hpp]) + ]) + +@@ -683,7 +1024,7 @@ AC_DEFUN([BOOST_STRING_ALGO], + # Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. This library was introduced in Boost + # 1.35.0. +-AC_DEFUN([BOOST_SYSTEM], ++BOOST_DEFUN([System], + [BOOST_FIND_LIB([system], [$1], + [boost/system/error_code.hpp], + [boost::system::error_code e; e.clear();]) +@@ -694,7 +1035,7 @@ AC_DEFUN([BOOST_SYSTEM], + # ------------------------------ + # Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_TEST], ++BOOST_DEFUN([Test], + [m4_pattern_allow([^BOOST_CHECK$])dnl + BOOST_FIND_LIB([unit_test_framework], [$1], + [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);], +@@ -704,45 +1045,58 @@ BOOST_FIND_LIB([unit_test_framework], [$ + ])# BOOST_TEST + + +-# BOOST_THREADS([PREFERRED-RT-OPT]) ++# BOOST_THREAD([PREFERRED-RT-OPT]) + # --------------------------------- + # Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-# FIXME: Provide an alias "BOOST_THREAD". +-AC_DEFUN([BOOST_THREADS], ++BOOST_DEFUN([Thread], + [dnl Having the pthread flag is required at least on GCC3 where + dnl boost/thread.hpp would complain if we try to compile without + dnl -pthread on GNU/Linux. + AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl +-boost_threads_save_LIBS=$LIBS +-boost_threads_save_CPPFLAGS=$CPPFLAGS +-LIBS="$LIBS $boost_cv_pthread_flag" +-# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, +-# boost/thread.hpp will trigger a #error if -pthread isn't used: +-# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support +-# is not turned on. Please set the correct command line options for +-# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" ++boost_thread_save_LIBS=$LIBS ++boost_thread_save_LDFLAGS=$LDFLAGS ++boost_thread_save_CPPFLAGS=$CPPFLAGS ++# Link-time dependency from thread to system was added as of 1.49.0. ++if test $boost_major_version -ge 149; then ++BOOST_SYSTEM([$1]) ++fi # end of the Boost.System check. ++m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl ++LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" + CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag" +-BOOST_FIND_LIB([thread], [$1], ++ ++# When compiling for the Windows platform, the threads library is named ++# differently. ++case $host_os in ++ (*mingw*) boost_thread_lib_ext=_win32;; ++esac ++BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext], ++ [$1], + [boost/thread.hpp], [boost::thread t; boost::mutex m;]) +-BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $boost_cv_pthread_flag" ++ ++BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" ++BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS" + BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag" +-LIBS=$boost_threads_save_LIBS +-CPPFLAGS=$boost_threads_save_CPPFLAGS +-])# BOOST_THREADS ++LIBS=$boost_thread_save_LIBS ++LDFLAGS=$boost_thread_save_LDFLAGS ++CPPFLAGS=$boost_thread_save_CPPFLAGS ++])# BOOST_THREAD ++ ++AU_ALIAS([BOOST_THREADS], [BOOST_THREAD]) + + + # BOOST_TOKENIZER() + # ----------------- + # Look for Boost.Tokenizer +-AC_DEFUN([BOOST_TOKENIZER], ++BOOST_DEFUN([Tokenizer], + [BOOST_FIND_HEADER([boost/tokenizer.hpp])]) + + + # BOOST_TRIBOOL() + # --------------- + # Look for Boost.Tribool +-AC_DEFUN([BOOST_TRIBOOL], ++BOOST_DEFUN([Tribool], + [BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp]) + BOOST_FIND_HEADER([boost/logic/tribool.hpp]) + ]) +@@ -751,65 +1105,61 @@ BOOST_FIND_HEADER([boost/logic/tribool.h + # BOOST_TUPLE() + # ------------- + # Look for Boost.Tuple +-AC_DEFUN([BOOST_TUPLE], ++BOOST_DEFUN([Tuple], + [BOOST_FIND_HEADER([boost/tuple/tuple.hpp])]) + + + # BOOST_TYPETRAITS() + # -------------------- + # Look for Boost.TypeTraits +-AC_DEFUN([BOOST_TYPETRAITS], ++BOOST_DEFUN([TypeTraits], + [BOOST_FIND_HEADER([boost/type_traits.hpp])]) + +-# BOOST_UNORDERED() +-# --------------- +-# Look for Boost.Unordered (unordered_map, unordered_set +-# etc.) +-AC_DEFUN([BOOST_UNORDERED], +-[BOOST_FIND_HEADER([boost/unordered_map.hpp]) +-BOOST_FIND_HEADER([boost/unordered_set.hpp])]) + + # BOOST_UTILITY() + # --------------- + # Look for Boost.Utility (noncopyable, result_of, base-from-member idiom, + # etc.) +-AC_DEFUN([BOOST_UTILITY], ++BOOST_DEFUN([Utility], + [BOOST_FIND_HEADER([boost/utility.hpp])]) + +-# BOOST_UUID() +-# ----------------- +-# Look for Boost.Uuid +-AC_DEFUN([BOOST_UUID], +-[BOOST_FIND_HEADER([boost/uuid/uuid.hpp]) +-BOOST_FIND_HEADER([boost/uuid/uuid_generators.hpp]) +-BOOST_FIND_HEADER([boost/uuid/uuid_io.hpp]) +-BOOST_FIND_HEADER([boost/uuid/uuid_serialize.hpp]) +-]) +- + + # BOOST_VARIANT() + # --------------- + # Look for Boost.Variant. +-AC_DEFUN([BOOST_VARIANT], ++BOOST_DEFUN([Variant], + [BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp]) + BOOST_FIND_HEADER([boost/variant.hpp])]) + + ++# BOOST_POINTER_CONTAINER() ++# ------------------------ ++# Look for Boost.PointerContainer ++BOOST_DEFUN([Pointer_Container], ++[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp]) ++BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp]) ++BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp]) ++BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp]) ++BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp]) ++BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp]) ++])# BOOST_POINTER_CONTAINER ++ ++ + # BOOST_WAVE([PREFERRED-RT-OPT]) + # ------------------------------ + # NOTE: If you intend to use Wave/Spirit with thread support, make sure you +-# call BOOST_THREADS first. ++# call BOOST_THREAD first. + # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. +-AC_DEFUN([BOOST_WAVE], ++BOOST_DEFUN([Wave], + [AC_REQUIRE([BOOST_FILESYSTEM])dnl + AC_REQUIRE([BOOST_DATE_TIME])dnl + boost_wave_save_LIBS=$LIBS + boost_wave_save_LDFLAGS=$LDFLAGS + m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl +-LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS\ ++LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \ + $BOOST_THREAD_LIBS" +-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS\ ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \ + $BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS" + BOOST_FIND_LIB([wave], [$1], + [boost/wave.hpp], +@@ -822,7 +1172,7 @@ LDFLAGS=$boost_wave_save_LDFLAGS + # BOOST_XPRESSIVE() + # ----------------- + # Look for Boost.Xpressive (new since 1.36.0). +-AC_DEFUN([BOOST_XPRESSIVE], ++BOOST_DEFUN([Xpressive], + [BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])]) + + +@@ -833,8 +1183,16 @@ AC_DEFUN([BOOST_XPRESSIVE], + + # _BOOST_PTHREAD_FLAG() + # --------------------- +-# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD: +-# http://autoconf-archive.cryp.to/acx_pthread.html ++# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag ++# which must be used in CPPFLAGS and LIBS. ++# ++# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, ++# boost/thread.hpp will trigger a #error if -pthread isn't used: ++# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support ++# is not turned on. Please set the correct command line options for ++# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" ++# ++# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html + AC_DEFUN([_BOOST_PTHREAD_FLAG], + [AC_REQUIRE([AC_PROG_CXX])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl +@@ -902,6 +1260,14 @@ AC_LANG_POP([C++])dnl + m4_define([_BOOST_gcc_test], + ["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl + ++# _BOOST_mingw_test(MAJOR, MINOR) ++# ----------------------------- ++# Internal helper for _BOOST_FIND_COMPILER_TAG. ++m4_define([_BOOST_mingw_test], ++["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \ ++ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ ++ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl ++ + + # _BOOST_FIND_COMPILER_TAG() + # -------------------------- +@@ -911,7 +1277,8 @@ m4_define([_BOOST_gcc_test], + AC_DEFUN([_BOOST_FIND_COMPILER_TAG], + [AC_REQUIRE([AC_PROG_CXX])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag], ++AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], ++ [boost_cv_lib_tag], + [boost_cv_lib_tag=unknown + if test x$boost_cv_inc_path != xno; then + AC_LANG_PUSH([C++])dnl +@@ -928,11 +1295,30 @@ if test x$boost_cv_inc_path != xno; then + # 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). +- # TODO: Move the test on GCC 4.4 up once it's released. + for i in \ ++ _BOOST_mingw_test(5, 0) \ ++ _BOOST_gcc_test(5, 0) \ ++ _BOOST_mingw_test(4, 10) \ ++ _BOOST_gcc_test(4, 10) \ ++ _BOOST_mingw_test(4, 9) \ ++ _BOOST_gcc_test(4, 9) \ ++ _BOOST_mingw_test(4, 8) \ ++ _BOOST_gcc_test(4, 8) \ ++ _BOOST_mingw_test(4, 7) \ ++ _BOOST_gcc_test(4, 7) \ ++ _BOOST_mingw_test(4, 6) \ ++ _BOOST_gcc_test(4, 6) \ ++ _BOOST_mingw_test(4, 5) \ ++ _BOOST_gcc_test(4, 5) \ ++ _BOOST_mingw_test(4, 4) \ ++ _BOOST_gcc_test(4, 4) \ ++ _BOOST_mingw_test(4, 3) \ + _BOOST_gcc_test(4, 3) \ ++ _BOOST_mingw_test(4, 2) \ + _BOOST_gcc_test(4, 2) \ ++ _BOOST_mingw_test(4, 1) \ + _BOOST_gcc_test(4, 1) \ ++ _BOOST_mingw_test(4, 0) \ + _BOOST_gcc_test(4, 0) \ + "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ + && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ +@@ -949,7 +1335,6 @@ if test x$boost_cv_inc_path != xno; then + "defined __ICC && (defined __unix || defined __unix__) @ il" \ + "defined __ICL @ iw" \ + "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ +- _BOOST_gcc_test(4, 4) \ + _BOOST_gcc_test(2, 95) \ + "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ + "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ +@@ -999,6 +1384,7 @@ fi])dnl end of AC_CACHE_CHECK + # Thread) flavors of Boost. Sets boost_guess_use_mt accordingly. + AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT], + [# Check whether we do better use `mt' even though we weren't ask to. ++AC_LANG_PUSH([C++])dnl + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #if defined _REENTRANT || defined _MT || defined __MT__ + /* use -mt */ +@@ -1006,6 +1392,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + # error MT not needed + #endif + ]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false]) ++AC_LANG_POP([C++])dnl + ]) + + # _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +@@ -1029,11 +1416,11 @@ boost_use_source=: + test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && + _AS_ECHO_LOG([re-using the existing conftest.$ac_objext]) + AS_IF([_AC_DO_STDERR($ac_link) && { +- test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || +- test ! -s conftest.err ++ test -z "$ac_[]_AC_LANG_ABBREV[]_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 + dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough. + }], + [$2], +Index: libcmis-0.5.0/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/Makefile.in ++++ libcmis-0.5.0/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -15,7 +15,17 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -78,12 +88,6 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-DIST_COMMON = $(top_srcdir)/coverage.mk $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.am $(top_srcdir)/configure \ +- $(am__configure_deps) $(srcdir)/libcmis.pc.in \ +- $(srcdir)/libcmis-c.pc.in $(srcdir)/cppcheck-test.sh.in \ +- $(dist_man_MANS) test-driver AUTHORS ChangeLog NEWS README \ +- config.guess config.sub depcomp install-sh missing ltmain.sh + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ +@@ -92,6 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d +@@ -361,6 +367,11 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir) + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) + DIST_SUBDIRS = $(SUBDIRS) ++am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ ++ $(srcdir)/cppcheck-test.sh.in $(srcdir)/libcmis-c.pc.in \ ++ $(srcdir)/libcmis.pc.in $(top_srcdir)/coverage.mk AUTHORS \ ++ COPYING ChangeLog INSTALL NEWS README compile config.guess \ ++ config.sub depcomp install-sh ltmain.sh missing test-driver + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -413,8 +424,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -580,16 +594,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ +- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -599,7 +612,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; +-$(top_srcdir)/coverage.mk: ++$(top_srcdir)/coverage.mk $(am__empty): + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +@@ -825,7 +838,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -1042,10 +1055,16 @@ dist-xz: distdir + $(am__post_remove_distdir) + + dist-tarZ: distdir ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + + dist-shar: distdir ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +@@ -1080,16 +1099,17 @@ distcheck: dist + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) +- mkdir $(distdir)/_build $(distdir)/_inst ++ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ && $(am__cd) $(distdir)/_build/sub \ ++ && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ ++ --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ +@@ -1277,6 +1297,8 @@ uninstall-am: uninstall-man uninstall-pk + ps ps-am recheck tags tags-am uninstall uninstall-am \ + uninstall-man uninstall-manx uninstall-pkgconfigDATA + ++.PRECIOUS: Makefile ++ + .PHONY: coverage genlcov coverage-clean + + coverage: +Index: libcmis-0.5.0/qa/libcmis-c/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/qa/libcmis-c/Makefile.in ++++ libcmis-0.5.0/qa/libcmis-c/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -14,7 +14,17 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -81,8 +91,6 @@ host_triplet = @host@ + @ENABLE_TESTS_TRUE@ test-c-build$(EXEEXT) + @ENABLE_TESTS_TRUE@TESTS = test-api$(EXEEXT) + subdir = qa/libcmis-c +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp $(top_srcdir)/test-driver + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -90,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -416,6 +425,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=. + TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ ++ $(top_srcdir)/test-driver + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -427,8 +438,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -606,10 +620,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qa/libcmis-c/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu qa/libcmis-c/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign qa/libcmis-c/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu qa/libcmis-c/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -669,14 +682,14 @@ distclean-compile: + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + + .c.obj: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -962,7 +975,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -1251,6 +1264,8 @@ uninstall-am: + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/qa/libcmis/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/qa/libcmis/Makefile.in ++++ libcmis-0.5.0/qa/libcmis/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -14,7 +14,17 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -82,8 +92,6 @@ host_triplet = @host@ + @ENABLE_TESTS_TRUE@TESTS = test-utils$(EXEEXT) test-json$(EXEEXT) \ + @ENABLE_TESTS_TRUE@ $(am__EXEEXT_1) + subdir = qa/libcmis +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp $(top_srcdir)/test-driver + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -91,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -482,6 +491,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=. + TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ ++ $(top_srcdir)/test-driver + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -493,8 +504,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -811,10 +825,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qa/libcmis/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu qa/libcmis/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign qa/libcmis/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu qa/libcmis/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -1425,7 +1438,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -1763,6 +1776,8 @@ uninstall-am: + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/qa/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/qa/Makefile.in ++++ libcmis-0.5.0/qa/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -14,7 +14,17 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -78,7 +88,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = qa +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -86,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -144,6 +154,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) ++am__DIST_COMMON = $(srcdir)/Makefile.in + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ + dir0=`pwd`; \ +@@ -180,8 +191,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -324,10 +338,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qa/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu qa/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign qa/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu qa/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -622,6 +635,8 @@ uninstall-am: + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/qa/mockup/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/qa/mockup/Makefile.in ++++ libcmis-0.5.0/qa/mockup/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -15,7 +15,17 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -79,8 +89,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = qa/mockup +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -88,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -186,6 +195,7 @@ am__define_uniq_tagged_files = \ + done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -197,8 +207,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -353,10 +366,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qa/mockup/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu qa/mockup/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign qa/mockup/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu qa/mockup/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -628,6 +640,8 @@ uninstall-am: + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/src/libcmis-c/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/src/libcmis-c/Makefile.in ++++ libcmis-0.5.0/src/libcmis-c/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -16,7 +16,17 @@ + + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -80,9 +90,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = src/libcmis-c +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp \ +- $(libcmis_c_@LIBCMIS_API_VERSION@_la_include_HEADERS) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -90,6 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am \ ++ $(libcmis_c_@LIBCMIS_API_VERSION@_la_include_HEADERS) \ ++ $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -215,6 +225,7 @@ am__can_run_installinfo = \ + esac + HEADERS = $(libcmis_c_@LIBCMIS_API_VERSION@_la_include_HEADERS) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -226,8 +237,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -416,10 +430,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcmis-c/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcmis-c/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign src/libcmis-c/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu src/libcmis-c/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -807,6 +820,8 @@ uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libcmis_c_@LIBCMIS_API_VERSION@_la_includeHEADERS + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/src/libcmis/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/src/libcmis/Makefile.in ++++ libcmis-0.5.0/src/libcmis/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -16,7 +16,17 @@ + + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -80,9 +90,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = src/libcmis +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp \ +- $(libcmis_@LIBCMIS_API_VERSION@_la_include_HEADERS) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -90,6 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am \ ++ $(libcmis_@LIBCMIS_API_VERSION@_la_include_HEADERS) \ ++ $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -242,6 +252,7 @@ am__define_uniq_tagged_files = \ + done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -253,8 +264,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -542,10 +556,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcmis/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcmis/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign src/libcmis/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu src/libcmis/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -942,6 +955,8 @@ uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libcmis_@LIBCMIS_API_VERSION@_la_includeHEADERS + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/src/Makefile.in +=================================================================== +--- libcmis-0.5.0.orig/src/Makefile.in ++++ libcmis-0.5.0/src/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -15,7 +15,17 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -80,8 +90,6 @@ build_triplet = @build@ + host_triplet = @host@ + @ENABLE_CLIENT_TRUE@bin_PROGRAMS = cmis-client$(EXEEXT) + subdir = src +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +@@ -89,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/b + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -183,6 +192,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ + dir0=`pwd`; \ +@@ -219,8 +229,11 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_DATE_TIME_LDFLAGS = @BOOST_DATE_TIME_LDFLAGS@ ++BOOST_DATE_TIME_LDPATH = @BOOST_DATE_TIME_LDPATH@ + BOOST_DATE_TIME_LIBS = @BOOST_DATE_TIME_LIBS@ ++BOOST_LDPATH = @BOOST_LDPATH@ + BOOST_PROGRAM_OPTIONS_LDFLAGS = @BOOST_PROGRAM_OPTIONS_LDFLAGS@ ++BOOST_PROGRAM_OPTIONS_LDPATH = @BOOST_PROGRAM_OPTIONS_LDPATH@ + BOOST_PROGRAM_OPTIONS_LIBS = @BOOST_PROGRAM_OPTIONS_LIBS@ + BOOST_ROOT = @BOOST_ROOT@ + CC = @CC@ +@@ -372,10 +385,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign src/Makefile +-.PRECIOUS: Makefile ++ $(AUTOMAKE) --gnu src/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -761,6 +773,8 @@ uninstall-am: uninstall-binPROGRAMS + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS + ++.PRECIOUS: Makefile ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: libcmis-0.5.0/qa/libcmis/test-ws.cxx +=================================================================== +--- libcmis-0.5.0.orig/qa/libcmis/test-ws.cxx ++++ libcmis-0.5.0/qa/libcmis/test-ws.cxx +@@ -68,7 +68,10 @@ namespace + { + const struct HttpRequest* request = curl_mockup_getRequest( url.c_str(), "", "POST", bodyMatch ); + char* contentType = curl_mockup_HttpRequest_getHeader( request, "Content-Type" ); +- RelatedMultipart multipart( request->body, string( contentType ) ); ++ string ct; ++ if (contentType) ++ ct = contentType; ++ RelatedMultipart multipart( request->body, ct ); + RelatedPartPtr part = multipart.getPart( multipart.getStartId() ); + string xml = part->getContent( ); + curl_mockup_HttpRequest_free( request );