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

Do not require libm when searching for system boost

Browse Source 
Doing so breaks building under Haiku, which does not have libm.

See ticket #7568 for details.
This commit is contained in:
Jean-Marc Lasgouttes 2015-06-11 17:47:07 +02:00
parent 7da18d9db9
commit ba13a832d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/lyxinclude.m4
View File

@ -388,7 +388,7 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
save_LIBS=$LIBS save_LIBS=$LIBS
AC_MSG_CHECKING([for multithreaded boost libraries]) AC_MSG_CHECKING([for multithreaded boost libraries])
LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD" LIBS="$save_LIBS -lboost_signals-mt $LIBTHREAD"
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <boost/signal.hpp>], [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
[boost::signal<void ()> s;])], [boost::signal<void ()> s;])],
@ -396,7 +396,7 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
BOOST_MT="-mt"], BOOST_MT="-mt"],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_CHECKING([for plain boost libraries]) AC_MSG_CHECKING([for plain boost libraries])
LIBS="$save_LIBS -lboost_signals -lm" LIBS="$save_LIBS -lboost_signals"
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <boost/signal.hpp>], [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
[boost::signal<void ()> s;])], [boost::signal<void ()> s;])],
@ -459,9 +459,9 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[
if test x$ac_cv_header_mythes_h != xyes; then if test x$ac_cv_header_mythes_h != xyes; then
AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes/mythes.hxx>"]) AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
fi fi
AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm]) AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no])
if test x$lyx_mythes != xyes; then if test x$lyx_mythes != xyes; then
AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no], [-lm]) AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no])
fi fi
AC_LANG_POP(C++) AC_LANG_POP(C++)
if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then