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

partial fix for external boost detection

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29856 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2009-05-26 19:50:37 +00:00
parent 5fb0ed491c
commit 65ef3251a8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/common.am
View File

@ -33,7 +33,11 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
else else
BOOST_INCLUDES = BOOST_INCLUDES =
BOOST_LIBS = -lboost_filesystem -lboost_regex -lboost_signals -lboost_iostreams BOOST_FILESYSTEM = -lboost_filesystem$(BOOST_MT)
BOOST_REGEX = -lboost_regex$(BOOST_MT)
BOOST_SIGNALS = -lboost_signals$(BOOST_MT)
BOOST_IOSTREAMS = -lboost_iostreams$(BOOST_MT)
BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
endif endif
LIBS = LIBS =

14
config/lyxinclude.m4
View File

@ -430,6 +430,20 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
[lyx_cv_with_included_boost=yes]) [lyx_cv_with_included_boost=yes])
AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_boost]) AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost != xyes ; then
AC_CHECK_LIB(boost_signals, main, [lyx_boost_underscore=yes], [], [-lm])
AC_CHECK_LIB(boost_signals-mt, main, [lyx_boost_underscore_mt=yes], [], [-lm $LIBTHREAD])
if test 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 (do not use --without-included-boost)])
fi
fi
AC_SUBST(BOOST_SEP)
AC_SUBST(BOOST_MT)
fi
]) ])