[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit c78d7a8a0e255d6603f8ce2e7f5566e127b0f0ef
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Thu Nov 15 10:43:19 2012 +0100

    Drop the check for unordered_map.hxx
    
    The check itself was always failing unless you added 0x to cxxflags
    and we can safely assume the header to be there.
    If the header fails during compile time it throws nice
    error explaining what is going on anyway.
    
    Change-Id: Iedff10f3b2562f731063107df7220efa124aca08
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 96ee115..39fb2cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7924,8 +7924,6 @@ if test "$with_system_boost" = "yes"; then
        [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
     AC_CHECK_HEADER(boost/function.hpp, [],
        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
-    AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE],
-                   [AC_MSG_WARN([boost/unordered_map.hpp not found])], [])
 
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -fno-exceptions"
@@ -7955,9 +7953,7 @@ else
     BUILD_TYPE="$BUILD_TYPE BOOST"
     SYSTEM_BOOST=NO
     BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-    HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
-AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
 AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
 AC_SUBST(SYSTEM_BOOST)
 AC_SUBST(BOOST_TARBALL)