[Pkg-lyx-devel] svn commit: r331 - in /lyx/branches/lyx-1.5/debian: changelog control patches/boost-mt patches/series rules

hoaxter-guest at users.alioth.debian.org hoaxter-guest at users.alioth.debian.org
Sat Jun 23 09:06:18 UTC 2007 

Author: hoaxter-guest
Date: Sat Jun 23 09:06:18 2007
New Revision: 331

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=331
Log:
Build with the external boost libs from Debian

Added:
    lyx/branches/lyx-1.5/debian/patches/boost-mt
Modified:
    lyx/branches/lyx-1.5/debian/changelog
    lyx/branches/lyx-1.5/debian/control
    lyx/branches/lyx-1.5/debian/patches/series
    lyx/branches/lyx-1.5/debian/rules

Modified: lyx/branches/lyx-1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/changelog?rev=331&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/changelog (original)
+++ lyx/branches/lyx-1.5/debian/changelog Sat Jun 23 09:06:18 2007
@@ -1,8 +1,18 @@
 lyx (1.5.0~rc1-2) UNRELEASED; urgency=low
 
+  [ Per Olofsson ]
   * Remove boost_ia64 patch, integrated upstream.
 
- -- Per Olofsson <pelle at debian.org>  Fri, 22 Jun 2007 19:22:10 +0100
+  [ Sven Hoexter ]
+  * Introducing patches/boost-mt. This patch changes
+  all -lboost_* to -lboost_*-mt. The rational behind
+  this change is documented in the BTS #424038.
+  Now we're able to link against the external libboost 1.34
+  packages in the Debian archive.
+  * Reintroducing Per's changes to rules and control so
+  that we can build --without-included-boost.
+  
+ -- Sven Hoexter <sven at timegate.de>  Sat, 23 Jun 2007 11:03:45 +0200
 
 lyx (1.5.0~rc1-1) experimental; urgency=low
 

Modified: lyx/branches/lyx-1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/control?rev=331&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/control (original)
+++ lyx/branches/lyx-1.5/debian/control Sat Jun 23 09:06:18 2007
@@ -6,7 +6,7 @@
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-lyx/lyx/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk
-Build-Depends: libaiksaurus-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt (>= 0.40-1), g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt4-dev (>> 4.3)
+Build-Depends: libaiksaurus-dev, python-support (>= 0.5.3), debhelper (>= 5.0.37.2), quilt (>= 0.40-1), g++ (>= 4:4.0.1-8), libz-dev, libx11-dev, libaspell-dev, dpkg-dev (>= 1.13.19), autotools-dev, libqt4-dev (>> 4.3), libboost-dev, libboost-filesystem-dev, libboost-signals-dev, libboost-iostreams-dev, libboost-regex-dev, libboost-test-dev
 
 Package: lyx
 Architecture: any

Added: lyx/branches/lyx-1.5/debian/patches/boost-mt
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/patches/boost-mt?rev=331&op=file
==============================================================================
--- lyx/branches/lyx-1.5/debian/patches/boost-mt (added)
+++ lyx/branches/lyx-1.5/debian/patches/boost-mt Sat Jun 23 09:06:18 2007
@@ -1,0 +1,723 @@
+Index: lyx-1.5.0rc1/boost/libs/filesystem/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/filesystem/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/filesystem/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = src
+ all: all-recursive
+Index: lyx-1.5.0rc1/boost/libs/filesystem/src/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/filesystem/src/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/filesystem/src/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -282,13 +282,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/boost/libs/iostreams/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/iostreams/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/iostreams/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = src
+ all: all-recursive
+Index: lyx-1.5.0rc1/boost/libs/iostreams/src/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/iostreams/src/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/iostreams/src/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -282,13 +282,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/boost/libs/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/Makefile.in	2007-06-01 01:52:46.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = filesystem iostreams regex signals
+ all: all-recursive
+Index: lyx-1.5.0rc1/boost/libs/regex/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/regex/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/regex/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = src
+ all: all-recursive
+Index: lyx-1.5.0rc1/boost/libs/regex/src/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/regex/src/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/regex/src/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -285,13 +285,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/boost/libs/signals/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/signals/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/signals/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = src
+ all: all-recursive
+Index: lyx-1.5.0rc1/boost/libs/signals/src/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/libs/signals/src/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/boost/libs/signals/src/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -282,13 +282,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/boost/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/boost/Makefile.in	2007-06-01 01:52:46.000000000 +0200
++++ lyx-1.5.0rc1/boost/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = libs
+ EXTRA_DIST = boost
+Index: lyx-1.5.0rc1/config/common.am
+===================================================================
+--- lyx-1.5.0rc1.orig/config/common.am	2006-04-20 22:44:05.000000000 +0200
++++ lyx-1.5.0rc1/config/common.am	2007-06-23 10:46:49.000000000 +0200
+@@ -36,10 +36,10 @@
+ BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ else
+ BOOST_INCLUDES =
+-BOOST_FILESYSTEM = -lboost_filesystem
+-BOOST_REGEX = -lboost_regex
+-BOOST_SIGNALS = -lboost_signals
+-BOOST_IOSTREAMS = -lboost_iostreams
++BOOST_FILESYSTEM = -lboost_filesystem-mt
++BOOST_REGEX = -lboost_regex-mt
++BOOST_SIGNALS = -lboost_signals-mt
++BOOST_IOSTREAMS = -lboost_iostreams-mt
+ endif
+ 
+ LIBS =
+Index: lyx-1.5.0rc1/config/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/config/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/config/Makefile.in	2007-06-23 10:46:49.000000000 +0200
+@@ -263,13 +263,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = \
+ 	common.am \
+Index: lyx-1.5.0rc1/development/MacOSX/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/development/MacOSX/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/development/MacOSX/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -289,13 +289,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = spotlight
+ bundledir = ${prefix}/Contents
+Index: lyx-1.5.0rc1/development/MacOSX/spotlight/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/development/MacOSX/spotlight/Makefile.in	2007-06-01 01:52:47.000000000 +0200
++++ lyx-1.5.0rc1/development/MacOSX/spotlight/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -279,13 +279,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ bundledir = $(prefix)/Contents
+ spotlightdir = $(bundledir)/Library/Spotlight/LyX-Metadata.mdimporter/Contents
+Index: lyx-1.5.0rc1/development/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/development/Makefile.in	2007-06-01 01:52:48.000000000 +0200
++++ lyx-1.5.0rc1/development/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -273,13 +273,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ @INSTALL_MACOSX_TRUE at SUBDIRS = MacOSX
+ EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \
+Index: lyx-1.5.0rc1/lib/doc/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/lib/doc/Makefile.in	2007-06-01 01:52:48.000000000 +0200
++++ lyx-1.5.0rc1/lib/doc/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -328,13 +328,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = depend.py doc_toc.py README.Documentation $(DEPENDFILE) $(docfiles)
+ clipartdocdir = $(pkgdatadir)/doc/clipart
+Index: lyx-1.5.0rc1/lib/lyx2lyx/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/lib/lyx2lyx/Makefile.in	2007-06-01 01:52:48.000000000 +0200
++++ lyx-1.5.0rc1/lib/lyx2lyx/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -271,13 +271,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = lyx2lyx_version.py.in
+ CHMOD = chmod
+Index: lyx-1.5.0rc1/lib/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/lib/Makefile.in	2007-06-01 01:52:48.000000000 +0200
++++ lyx-1.5.0rc1/lib/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -363,13 +363,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = doc lyx2lyx
+ CHMOD = chmod
+Index: lyx-1.5.0rc1/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/Makefile.in	2007-06-01 01:52:46.000000000 +0200
++++ lyx-1.5.0rc1/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -292,13 +292,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ ACLOCAL_AMFLAGS = -I m4 -I config
+ DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+Index: lyx-1.5.0rc1/sourcedoc/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/sourcedoc/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/sourcedoc/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -261,13 +261,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = Doxyfile.in
+ all: all-am
+Index: lyx-1.5.0rc1/src/client/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/client/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/client/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -303,13 +303,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h lyxclient.man
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/src/frontends/controllers/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/frontends/controllers/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/frontends/controllers/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -313,13 +313,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = tests
+ EXTRA_DIST = pch.h BCView.tmpl
+Index: lyx-1.5.0rc1/src/frontends/controllers/tests/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/frontends/controllers/tests/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/frontends/controllers/tests/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -280,13 +280,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h test_biblio
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/src/frontends/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/frontends/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/frontends/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -300,13 +300,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
+ DIST_SUBDIRS = controllers qt4
+Index: lyx-1.5.0rc1/src/frontends/qt4/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/frontends/qt4/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/frontends/qt4/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -330,13 +330,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ UIFILES = \
+ 	AboutUi.ui \
+Index: lyx-1.5.0rc1/src/frontends/qt4/ui/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/frontends/qt4/ui/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/frontends/qt4/ui/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -263,13 +263,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ UIFILES = \
+ 	AboutUi.ui \
+Index: lyx-1.5.0rc1/src/graphics/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/graphics/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/graphics/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -293,13 +293,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/src/insets/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/insets/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/insets/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -304,13 +304,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ noinst_LTLIBRARIES = libinsets.la
+ EXTRA_DIST = \
+Index: lyx-1.5.0rc1/src/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/Makefile.in	2007-06-01 01:52:49.000000000 +0200
++++ lyx-1.5.0rc1/src/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -405,13 +405,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ @BUILD_CLIENT_SUBDIR_TRUE at CLIENT = client
+ SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
+Index: lyx-1.5.0rc1/src/mathed/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/mathed/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/mathed/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -312,13 +312,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h InsetFormulaMacro.cpp
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/src/support/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/support/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/support/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -312,13 +312,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ SUBDIRS = . tests
+ EXTRA_DIST = Package.cpp.in pch.h \
+Index: lyx-1.5.0rc1/src/support/tests/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/support/tests/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/support/tests/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -300,13 +300,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = pch.h test_convert test_filetools test_lstrings regfiles
+ BUILT_SOURCES = $(PCH_FILE)
+Index: lyx-1.5.0rc1/src/tex2lyx/Makefile.in
+===================================================================
+--- lyx-1.5.0rc1.orig/src/tex2lyx/Makefile.in	2007-06-01 01:52:50.000000000 +0200
++++ lyx-1.5.0rc1/src/tex2lyx/Makefile.in	2007-06-23 10:46:50.000000000 +0200
+@@ -312,13 +312,13 @@
+ SUFFIXES = .gch
+ @USE_INCLUDED_BOOST_FALSE at BOOST_INCLUDES = 
+ @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
+- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
++ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
++ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
++ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
++ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
+ @USE_INCLUDED_BOOST_TRUE at BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
+ EXTRA_DIST = tex2lyx.man pch.h test-structure.tex test-insets.tex
+ 

Modified: lyx/branches/lyx-1.5/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/patches/series?rev=331&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/patches/series (original)
+++ lyx/branches/lyx-1.5/debian/patches/series Sat Jun 23 09:06:18 2007
@@ -1,1 +1,2 @@
+boost-mt
 05.configure.py_prog_prefer

Modified: lyx/branches/lyx-1.5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.5/debian/rules?rev=331&op=diff
==============================================================================
--- lyx/branches/lyx-1.5/debian/rules (original)
+++ lyx/branches/lyx-1.5/debian/rules Sat Jun 23 09:06:18 2007
@@ -28,7 +28,7 @@
 	--with-aspell \
 	--with-x \
 	--without-included-gettext \
-	--with-included-boost \
+	--without-included-boost \
 
 # temporarily disable because of bug in binutils
 #CFLAGS += -g

More information about the Pkg-lyx-devel mailing list