Index: config/lyxinclude.m4
===================================================================
--- config/lyxinclude.m4	(Revision 29705)
+++ config/lyxinclude.m4	(Arbeitskopie)
@@ -430,6 +430,32 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	    [lyx_cv_with_included_boost=yes])
 	AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
 	AC_MSG_RESULT([$lyx_cv_with_included_boost])
+	if test x$lyx_cv_with_included_boost != xyes ; then
+		dnl delete cache, since it does not see the difference of - and _
+		AC_CHECK_LIB(boost-signals, main, [lyx_boost_plain=yes], [], [-lm])
+		unset ac_cv_lib_boost_signals_main
+		AC_CHECK_LIB(boost_signals, main, [lyx_boost_underscore=yes], [], [-lm])
+		unset ac_cv_lib_boost_signals_main
+		AC_CHECK_LIB(boost-signals-mt, main, [lyx_boost_plain_mt=yes], [], [-lm $LIBTHREAD])
+		unset ac_cv_lib_boost_signals_mt_main
+		AC_CHECK_LIB(boost_signals-mt, main, [lyx_boost_underscore_mt=yes], [], [-lm $LIBTHREAD])
+		unset ac_cv_lib_boost_signals_mt_main
+		if test x$lyx_boost_underscore = xyes -o x$lyx_boost_underscore_mt = xyes ; then
+			BOOST_SEP="_"
+		else
+			BOOST_SEP="-"
+		fi
+		if test x$lyx_boost_mt = xyes -o x$lyx_boost_underscore_mt = xyes ; then
+			BOOST_MT="-mt"
+		else
+			BOOST_MT=""
+			if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then
+				LYX_ERROR([No suitable boost library found (use --with-included-boost)])
+			fi
+		fi
+		AC_SUBST(BOOST_SEP)
+		AC_SUBST(BOOST_MT)
+	fi
 ])
 
 
Index: config/common.am
===================================================================
--- config/common.am	(Revision 29705)
+++ config/common.am	(Arbeitskopie)
@@ -33,7 +33,11 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
 BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =
-BOOST_LIBS = -lboost_filesystem -lboost_regex -lboost_signals -lboost_iostreams
+BOOST_FILESYSTEM = -lboost$(BOOST_SEP)filesystem$(BOOST_MT)
+BOOST_REGEX = -lboost$(BOOST_SEP)regex$(BOOST_MT)
+BOOST_SIGNALS = -lboost$(BOOST_SEP)signals$(BOOST_MT)
+BOOST_IOSTREAMS = -lboost$(BOOST_SEP)iostreams$(BOOST_MT)
+BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 endif
 
 LIBS =