hack to let boost know if limit exists or not

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2082 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/boost/ChangeLog b/boost/ChangeLog
index 0eb7c8cb276c06c615fbef14deb231d1e736913a..3fce77cc9c6a89eb10f3b0a6ec9d53ce493d350a 100644 (file)
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -4,6 +4,8 @@
        * boost/static_assert.hpp: update
        * boost/smart_ptr.hpp: update
        * boost/config.hpp: update
+       (BOOST_NO_LIMITS): add a hack so that we can continue to use
+       lyxstring.
 
        * boost/detail/limits.hpp: new file
        * boost/limits.hpp: new file

diff --git a/boost/boost/config.hpp b/boost/boost/config.hpp
index b05746e137c03ffbe169bac83b934084c1390743..4b975aa268c39ec1bd0dec575ed1f0db12734daf 100644 (file)
--- a/boost/boost/config.hpp
+++ b/boost/boost/config.hpp
@@ -265,6 +265,11 @@
 #       define BOOST_NO_SLIST
 #       define BOOST_NO_HASH
 #     endif
+// LYX: begin
+#   ifndef HAVE_LIMITS
+#      define BOOST_NO_LIMITS
+#   endif
+// LYX: end
 #   endif
 
 //  Intel on Linux ---------------------------------------------------------

diff --git a/configure.in b/configure.in
index 58601e916ebe945e426174ad869117c45d08865b..962f64d67a7f6af5cc591d5b6a9135b916b9d7f3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -93,7 +93,7 @@ LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale)
+AC_CHECK_HEADERS(ostream istream sstream locale limits)
 LYX_CXX_STL_MODERN_STREAMS
 
 ### We need a regex implementation, so we provide our own if none is found.