projects
/
shibboleth
/
cpp-xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add check for Boost pointer container
[shibboleth/cpp-xmltooling.git]
/
m4
/
boost.m4
diff --git
a/m4/boost.m4
b/m4/boost.m4
index
6a9294c
..
8d0920a
100644
(file)
--- a/
m4/boost.m4
+++ b/
m4/boost.m4
@@
-206,12
+206,12
@@
AC_LANG_POP([C++])dnl
AC_CACHE_CHECK([for Boost's header version],
[boost_cv_lib_version],
[m4_pattern_allow([^BOOST_LIB_VERSION$])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;q;}],
+ _BOOST_SED_CPP([/^boost
_lib_
version = /{s///;s/\"//g;p;q;}],
[#include <boost/version.hpp>
[#include <boost/version.hpp>
-boost
-lib-
version = BOOST_LIB_VERSION],
+boost
_lib_
version = BOOST_LIB_VERSION],
[boost_cv_lib_version=`cat conftest.i`])])
# e.g. "134" for 1_34_1 or "135" for 1_35
[boost_cv_lib_version=`cat conftest.i`])])
# e.g. "134" for 1_34_1 or "135" for 1_35
- boost_major_version=`echo "$boost_cv_lib_version" |
sed 's/_//;s/_.*
//'`
+ boost_major_version=`echo "$boost_cv_lib_version" |
$SED 's/_//;s/_.*//;s/
//'`
case $boost_major_version in #(
'' | *[[!0-9]]*)
AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
case $boost_major_version in #(
'' | *[[!0-9]]*)
AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
@@
-644,6
+644,11
@@
BOOST_DEFUN([Numeric_Conversion],
BOOST_DEFUN([Optional],
[BOOST_FIND_HEADER([boost/optional.hpp])])
BOOST_DEFUN([Optional],
[BOOST_FIND_HEADER([boost/optional.hpp])])
+# BOOST_PTR_CONTAINER()
+# ----------------
+# Look for Boost.PointerContainer
+BOOST_DEFUN([Ptr_Container],
+[BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp])])
# BOOST_PREPROCESSOR()
# --------------------
# BOOST_PREPROCESSOR()
# --------------------