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

Get rid of boost signals in multithreading test

Browse Source 
Test for regex instead since this is the only boost library we are linking against.
This commit is contained in:
Georg Baum 2016-06-11 09:04:50 +02:00
parent bb5c760b37
commit 7293fc7b66
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/lyxinclude.m4
View File

@ -398,20 +398,19 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
save_LIBS=$LIBS save_LIBS=$LIBS
dnl FIXME: Rewrite test to use regex, we do not use signals anymore.
AC_MSG_CHECKING([for multithreaded boost libraries]) AC_MSG_CHECKING([for multithreaded boost libraries])
LIBS="$save_LIBS -lboost_signals-mt $LIBTHREAD" LIBS="$save_LIBS -lboost_regex-mt $LIBTHREAD"
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <boost/signal.hpp>], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
[boost::signal<void ()> s;])], [boost::regex reg;])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
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" LIBS="$save_LIBS -lboost_regex"
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <boost/signal.hpp>], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
[boost::signal<void ()> s;])], [boost::regex reg;])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
BOOST_MT=""], BOOST_MT=""],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])