diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | download.lst | 2 |
2 files changed, 3 insertions, 11 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" diff --git a/download.lst b/download.lst index 4ba7b0806a91..6cfcfe5197df 100644 --- a/download.lst +++ b/download.lst @@ -63,7 +63,7 @@ export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz export LIBXSLT_TARBALL := e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 096fbb818177a7575511c1fd9d4bf7dd-mdds_0.7.1.tar.bz2 +export MDDS_TARBALL := b0bba8c768f3d92608a07149039510e5-mdds_0.8.0.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz |