configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
New commits: commit 05bca3d8d64ced9da9f3f24eba26c69b419549d8 Author: Kohei Yoshida <[email protected]> Date: Thu May 9 12:44:48 2013 -0400 Go back to the old way of detecting headers. Change-Id: Iabad8f0a3936fa30d4ba68a717a79e4e0b497991 diff --git a/configure.ac b/configure.ac index d6b7285..3cd4c12 100644 --- a/configure.ac +++ b/configure.ac @@ -8036,8 +8036,6 @@ 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 =================================================================== @@ -8049,6 +8047,16 @@ 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.8.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.8.0)], [#include <mdds/multi_type_vector.hpp>]) + CPPFLAGS="$save_CPPFLAGS" + AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE MDDS" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
