mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Go back to the old way of detecting headers.

Browse Source 
Change-Id: Iabad8f0a3936fa30d4ba68a717a79e4e0b497991
This commit is contained in:
Kohei Yoshida
2013-05-09 12:44:48 -04:00
parent af86f7b26f
commit c239706d29
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -8082,8 +8082,6 @@ if test "$with_system_mdds" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_MDDS=YES SYSTEM_MDDS=YES
PKG_CHECK_MODULES(MDDS, mdds >= 0.8.0)
dnl =================================================================== dnl ===================================================================
dnl Determine which hash container mdds shall use dnl Determine which hash container mdds shall use
dnl =================================================================== dnl ===================================================================
@@ -8095,6 +8093,16 @@ if test "$with_system_mdds" = "yes"; then
MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST" MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
AC_MSG_RESULT([boost::unordered_map]) AC_MSG_RESULT([boost::unordered_map])
fi 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 else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE MDDS" BUILD_TYPE="$BUILD_TYPE MDDS"