Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Boost::Log v2 support #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Boost::Log v2 support #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c520aa9
Add support for Boost::Log v2.
etiam May 24, 2013
3c643a3
Add support for Boost::log v2.
etiam May 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions build-aux/boost.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ fi


# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
# [CXX-PROLOGUE])
# [CXX-PROLOGUE], [CXX-PREHEADER])
# -------------------------------------------------------------------------
# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
# libboost_thread). Check that HEADER-NAME works and check that
Expand Down Expand Up @@ -335,7 +335,8 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
boost_save_ac_objext=$ac_objext
# Generate the test file.
AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
AC_LANG_CONFTEST([AC_LANG_PROGRAM([$6
#include <$3>
$5], [$4])])
dnl Optimization hacks: compiling C++ is slow, especially with Boost. What
dnl we're trying to do here is guess the right combination of link flags
Expand Down Expand Up @@ -654,9 +655,11 @@ BOOST_DEFUN([Lambda],
# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
# documentation of BOOST_FIND_LIB above.
BOOST_DEFUN([Log],
[BOOST_FIND_LIB([log], [$1],
[m4_pattern_allow([BOOST_LOG_DYN_LINK])
BOOST_FIND_LIB([log], [$1],
[boost/log/core/core.hpp],
[boost::log::attribute a; a.get_value();])
[boost::log::attribute a; a.get_value();],
[], [#define BOOST_LOG_DYN_LINK 1])
])# BOOST_LOG


Expand All @@ -666,9 +669,11 @@ BOOST_DEFUN([Log],
# documentation of BOOST_FIND_LIB above.
BOOST_DEFUN([Log_Setup],
[AC_REQUIRE([BOOST_LOG])dnl
m4_pattern_allow([BOOST_LOG_DYN_LINK])
BOOST_FIND_LIB([log_setup], [$1],
[boost/log/utility/init/from_settings.hpp],
[boost::log::basic_settings<char> bs; bs.empty();])
[boost::log::basic_settings<char> bs; bs.empty();],
[], [#define BOOST_LOG_DYN_LINK 1])
])# BOOST_LOG_SETUP


Expand Down