[Libreoffice-commits] .: 2 commits - configure.in

[René Engelhard]

 configure.in |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 4659a0d5d2e5700250dadb07d5c990b3acae331a
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jan 8 00:16:57 2011 +0100

    s/exceptons/exceptions/g in configure.in

diff --git a/configure.in b/configure.in
index 53c8000..3200acc 100755
--- a/configure.in
+++ b/configure.in
@@ -4804,9 +4804,9 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
    AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
    AC_TRY_COMPILE([#include <boost/function.hpp>
 ], [],
-   ac_cv_cxx_boost_no_exceptons_broken=no, ac_cv_cxx_boost_no_exceptons_broken=yes)
+   ac_cv_cxx_boost_no_exceptions_broken=no, ac_cv_cxx_boost_no_exceptions_broken=yes)
 
-   if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
+   if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
     AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
    else
       AC_MSG_RESULT([yes])
commit 6bdd632e0a04a4bdf1c14676c6f28bef73aa1745
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jan 8 00:13:07 2011 +0100

    update system-mdds check
    
    Check for mdds >= 0.5.0 as sc now needs it...

diff --git a/configure.in b/configure.in
index 5b238c3..53c8000 100755
--- a/configure.in
+++ b/configure.in
@@ -4854,6 +4854,26 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
     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"
+    save_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS $MDDS_CPPFLAGS"
+    AC_MSG_CHECKING([for correct signature of ::mdds::flat_segment_tree])
+    AC_TRY_RUN([#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])