Don't allow newline characters in document settings.

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index 885fd48c13b5efb980e4a22f5eff176eb2ac9a3e..6f7e31033779a7b6b2eaf9133e8c855abb40dbd9 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -30,13 +30,12 @@ SUFFIXES = .gch
 
 if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
-BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
+BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =
-BOOST_FILESYSTEM = -lboost_filesystem
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
+BOOST_REGEX = -lboost_regex$(BOOST_MT)
+BOOST_SIGNALS = -lboost_signals$(BOOST_MT)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
 endif
 
 LIBS =