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 b729a6f2b89ccd238b328340471933513b298ad1..58439ff7125aaae30068bccdf7c53cee32702ad2 100644 (file)
--- 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 598aa12ab28f1843e4a4a5c5555828dd667a27d8..a2e3c20fb8b48267a0886b0b338a45baab4d951b 100644 (file)
--- 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)