Jean-Marc Lasgouttes wrote:

>>>>>> "Georg" == Georg Baum
>>>>>> <[EMAIL PROTECTED]>
>>>>>> writes:
> 
> Georg> Slightly better patch.
> 
> Does not work for me :(

As I wrote: It does neither for me. For anybody who wants to do further work
on LyX until Lars and/or I have sorted this out I suggest to apply the
attached patch that avoids using boost::format completely. I already
committed the bugfix part of the patch I sent this morning.


Georg
Index: configure.ac
===================================================================
--- configure.ac	(Revision 14982)
+++ configure.ac	(Arbeitskopie)
@@ -385,11 +385,11 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
+//#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+//#  define USE_BOOST_FORMAT 1
+//#else
 #  define USE_BOOST_FORMAT 0
-#endif
+//#endif
 
 #define BOOST_USER_CONFIG <config.h>
 
Index: development/cmake/config.h.cmake
===================================================================
--- development/cmake/config.h.cmake	(Revision 14982)
+++ development/cmake/config.h.cmake	(Arbeitskopie)
@@ -119,11 +119,11 @@
 
 #define BOOST_ALL_NO_LIB 1
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
+//#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+//#  define USE_BOOST_FORMAT 1
+//#else
 #  define USE_BOOST_FORMAT 0
-#endif
+//#endif
 
 
 #if !defined(ENABLE_ASSERTIONS)
Index: development/scons/SConstruct
===================================================================
--- development/scons/SConstruct	(Revision 14982)
+++ development/scons/SConstruct	(Arbeitskopie)
@@ -915,11 +915,11 @@ if not fast_start or not os.path.isfile(
         ],
         config_post = '''
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
+//#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+//#  define USE_BOOST_FORMAT 1
+//#else
 #  define USE_BOOST_FORMAT 0
-#endif
+//#endif
 
 #if !defined(ENABLE_ASSERTIONS)
 #  define BOOST_DISABLE_ASSERTS 1

Reply via email to