Use the dispatch_result wrapper class DispatchResult to remove

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0602771db3212ca9bd4852ce5243ace728b7c724..b4fefe0a7c6f0fd8f8c4e893c64bce140c17e173 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
 LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
@@ -76,6 +74,19 @@ dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
+###
+AC_ARG_WITH(included-string,
+    AC_HELP_STRING([--with-included-string],[use std::string through namespace lyx]),
+       [lyx_cv_with_included_string=$withval
+       AC_MSG_RESULT([$with_included_string])],
+       [AC_CACHE_CHECK([],lyx_cv_with_included_string,[lyx_cv_with_included_string=no])])
+if test x$lyx_cv_with_included_string = xyes ; then
+    AC_DEFINE(USE_INCLUDED_STRING, 1,
+       [Define to use std::string through namespace lyx.])
+    lyx_flags="$lyx_flags included-string"
+fi
+
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,