strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

selection of hash container for mdds must precede header tests

Browse source
This commit is contained in:
David Tardon 2011-01-04 07:09:28 +01:00
parent ff5797e651
commit d1d813c7f2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
configure.in
View file

@ -4830,15 +4830,6 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
test "$with_system_mdds" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_MDDS=YES
AC_LANG_PUSH([C++])
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
[AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [],
[AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], [])
CPPFLAGS="$save_CPPFLAGS"
AC_LANG_POP([C++])
dnl ===================================================================
dnl Determine which hash container mdds shall use
@ -4854,6 +4845,16 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_STLPORT"
AC_MSG_RESULT([std::hash_map])
fi
AC_LANG_PUSH([C++])
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
[AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [],
[AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], [])
CPPFLAGS="$save_CPPFLAGS"
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE MDDS"