configure.in | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
New commits:
commit 889f9fc3c3850ed35fbbbbe399acc03c563154b9
Author: David Tardon <dtar...@redhat.com>
Date: Fri Jul 27 14:51:24 2012 +0200
update mdds check
Change-Id: I652d84f60a92369466f153a502022ac519312b22
diff --git a/configure.in b/configure.in
index 8cc14bc..6782015 100644
--- a/configure.in
+++ b/configure.in
@@ -7488,29 +7488,9 @@ if test "$with_system_mdds" = "yes"; then
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)], [])
+ AC_CHECK_HEADER(mdds/multi_type_matrix.hpp, [],
+ [AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >=
0.6.0)], [])
CPPFLAGS="$save_CPPFLAGS"
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $MDDS_CPPFLAGS"
- AC_MSG_CHECKING([for correct signature of ::mdds::flat_segment_tree])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <mdds/flat_segment_tree.hpp>
-
- int main(int argc, char **argv) {
- ::mdds::flat_segment_tree<long, short> db(0, 100, 0);
- short val;
- if (!db.search(5, val).second)
- return 1;
- return 0;
- }
-]])],[ac_cv_cxx_mdds_flat_segment_tree_correct=yes],[ac_cv_cxx_mdds_flat_segment_tree_correct=no],[])
-
- if test "$ac_cv_cxx_mdds_flat_segment_tree_correct" = "yes"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no, install mdds >= 0.5.0])
- fi
- CXXFLAGS=$save_CXXFLAGS
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
