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 detection of system boost

Browse Source 
Using LDFLAGS is not a good idea since it is not at the end of the link command. LIBS is better.

Some additional cleanup.
This commit is contained in:
Jean-Marc Lasgouttes 2012-10-08 10:58:45 +02:00
parent f4ac1b665e
commit 51cc826961
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/lyxinclude.m4
View File

@ -322,25 +322,24 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
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 if test x$lyx_cv_with_included_boost != xyes ; then
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
SAVED_LDFLAGS=$LDFLAGS save_LIBS=$LIBS
LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm" LIBS="$save_LIBS -lboost_signals -lm"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore=yes], []) AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_plain=yes], [])
LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD" LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore_mt=yes], []) AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_mt=yes], [])
LDFLAGS=$SAVED_LDFLAGS LIBS=$save_LIBS
AC_LANG_POP(C++) AC_LANG_POP(C++)
if test x$lyx_boost_underscore_mt = xyes ; then if test x$lyx_boost_mt = xyes ; then
BOOST_MT="-mt" BOOST_MT="-mt"
else else
BOOST_MT="" BOOST_MT=""
if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then if test x$lyx_boost_plain != xyes ; then
LYX_ERROR([No suitable boost library found (do not use --without-included-boost)]) LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
fi fi
fi fi
AC_SUBST(BOOST_SEP)
AC_SUBST(BOOST_MT) AC_SUBST(BOOST_MT)
fi fi
]) ])