summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-05-09 11:32:28 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-05-09 13:34:37 -0400
commit338a6cb6c548764ed5e4dad0ca26eb3ff8d387ab (patch)
treee562fa7516118ba67c47b50707d8b2902fb76858 /configure.ac
parent7e44f6b6ad386572b7f017a7a66bcd68d586a329 (diff)
Update mdds to 0.8.0.
Change-Id: I5dcf3b14993ac4d699e884c4981af668277a41df
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 2 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index b16ba33240b0..e138a45cde28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8082,6 +8082,8 @@ if test "$with_system_mdds" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_MDDS=YES
+ PKG_CHECK_MODULES(MDDS, mdds >= 0.8.0)
+
dnl ===================================================================
dnl Determine which hash container mdds shall use
dnl ===================================================================
@@ -8093,16 +8095,6 @@ if test "$with_system_mdds" = "yes"; then
MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
AC_MSG_RESULT([boost::unordered_map])
fi
-
- AC_LANG_PUSH([C++])
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
- AC_CHECK_HEADER(mdds/multi_type_vector.hpp, [],
- [AC_MSG_ERROR(mdds/multi_type_vector.hpp not found. Install mdds >= 0.7.0)], [])
- AC_CHECK_TYPE(mdds::multi_type_vector<int>::iterator, [],
- [AC_MSG_ERROR(mdds/multi_type_matrix.hpp does not define multi_type_vector::iterator. Install mdds >= 0.7.0)], [#include <mdds/multi_type_vector.hpp>])
- CPPFLAGS="$save_CPPFLAGS"
- AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE MDDS"