projects / packages / libcmis.git / blame
| Commit | Line | Data |
|---|---|---|
| ac005b61 AM |
1 | diff -urN libcmis-0.5.0.org/m4/boost.m4 libcmis-0.5.0/m4/boost.m4 |
| 2 | --- libcmis-0.5.0.org/m4/boost.m4 2014-03-28 15:19:57.000000000 +0100 | |
| 3 | +++ libcmis-0.5.0/m4/boost.m4 2015-09-21 14:42:25.149565264 +0200 | |
| 4 | @@ -68,7 +68,9 @@ | |
| 5 | dnl everything else. | |
| 6 | dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK | |
| 7 | (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | | |
| 8 | + grep -v '#' | | |
| 9 | tr -d '\r' | | |
| 10 | + tr -s '\n' ' ' | | |
| 11 | $SED -n -e "$1" >conftest.i 2>&1], | |
| 12 | [$3], | |
| 13 | [$4]) | |
| 14 | @@ -201,7 +203,7 @@ | |
| 15 | AC_CACHE_CHECK([for Boost's header version], | |
| 16 | [boost_cv_lib_version], | |
| 17 | [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl | |
| 18 | - _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}], | |
| 19 | + _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]], | |
| 20 | [#include <boost/version.hpp> | |
| 21 | boost-lib-version = BOOST_LIB_VERSION], | |
| 22 | [boost_cv_lib_version=`cat conftest.i`])]) | |
| 23 | @@ -209,7 +211,7 @@ | |
| 24 | boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` | |
| 25 | case $boost_major_version in #( | |
| 26 | '' | *[[!0-9]]*) | |
| 27 | - AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version]) | |
| 28 | + AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version']) | |
| 29 | ;; | |
| 30 | esac | |
| 31 | fi | |
| 32 | @@ -930,6 +932,7 @@ | |
| 33 | # the same defines as GCC's). | |
| 34 | # TODO: Move the test on GCC 4.4 up once it's released. | |
| 35 | for i in \ | |
| 36 | + _BOOST_gcc_test(5, 2) \ | |
| 37 | _BOOST_gcc_test(4, 3) \ | |
| 38 | _BOOST_gcc_test(4, 2) \ | |
| 39 | _BOOST_gcc_test(4, 1) \ |