From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 13 Aug 2007 23:48:39 +0000 (+0000)
Subject: more boost fixes
X-Git-Tag: 1.6.10~8891
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=682a70e89ccd570ba0952f0cb009184578a4bde9;p=features.git

more boost fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19532 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/boost/Makefile.am b/boost/Makefile.am
index b729a6f2b8..58439ff712 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -33,15 +33,18 @@ liblyxboost_la_SOURCES = \
 	libs/filesystem/src/path.cpp \
 	libs/filesystem/src/portability.cpp \
 	\
+	libs/regex/src/c_regex_traits.cpp \
+	libs/regex/src/cpp_regex_traits.cpp \
 	libs/regex/src/cregex.cpp \
 	libs/regex/src/fileiter.cpp \
+	libs/regex/src/instances.cpp \
+	libs/regex/src/posix_api.cpp \
 	libs/regex/src/regex.cpp \
+	libs/regex/src/regex_debug.cpp \
 	libs/regex/src/regex_raw_buffer.cpp \
 	libs/regex/src/regex_traits_defaults.cpp \
 	libs/regex/src/w32_regex_traits.cpp \
-	libs/regex/src/posix_api.cpp \
 	libs/regex/src/wide_posix_api.cpp \
-	libs/regex/src/regex_debug.cpp \
 	libs/regex/src/winstances.cpp \
 	\
 	libs/signals/src/connection.cpp \
diff --git a/configure.ac b/configure.ac
index 598aa12ab2..a2e3c20fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,7 @@ AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--with-monolithic-boost],
 		[Use monolithic boost compilations]),,
   [monolithic_boost=$withval],
-	[monolithic_boost=yes]
+	[monolithic_boost=no]
 )
 AM_CONDITIONAL(MONOLITHIC_BOOST, test $monolithic_boost = yes)