anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linking with std::regex and included boost

Browse Source
This commit is contained in:
Georg Baum 2016-06-11 10:09:48 +02:00
parent e8b15b5f0c
commit 20a00903b1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/lyxinclude.m4
View File

@ -393,7 +393,11 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost = xyes ; then
BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
if test $lyx_std_regex = yes ; then
BOOST_LIBS=""
else
BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
fi
else
BOOST_INCLUDES=
if test $lyx_std_regex = yes ; then