RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9848 from dx9/wip-ac-boost

Browse Source 
configure.ac: add _LIBS variables for boost_system and boost_iostreams

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-08-10 12:07:02 +08:00 committed by GitHub
commit 0911db3b73
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -969,13 +969,23 @@ AC_CHECK_HEADER([boost/program_options/option.hpp], [],
# If we have the boost system library installed, then we may want to link
# with it.
saved_LIBS="${LIBS}"
LIBS=""
AC_CHECK_LIB(boost_system-mt, main, [],
[AC_CHECK_LIB(boost_system, main, [],
AC_MSG_NOTICE(["Boost system library not found."]))])
BOOST_SYSTEM_LIBS="${LIBS}"
LIBS="${saved_LIBS}"
AC_SUBST(BOOST_SYSTEM_LIBS)
saved_LIBS="${LIBS}"
LIBS=""
AC_CHECK_LIB(boost_iostreams-mt, main, [],
[AC_CHECK_LIB(boost_iostreams, main, [],
AC_MSG_FAILURE(["Boost iostreams library not found."]))])
BOOST_IOSTREAMS_LIBS="${LIBS}"
LIBS="${saved_LIBS}"
AC_SUBST(BOOST_IOSTREAMS_LIBS)
# Find the right boost_thread library.
BOOST_THREAD_LIBS=""

2
src/common/Makefile.am
View File

@ -173,6 +173,8 @@ LIBCOMMON_DEPS += \
$(LIBCOMPRESSOR) \
$(LIBMSG) $(LIBAUTH) \
$(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
$(BOOST_SYSTEM_LIBS) \
$(BOOST_IOSTREAMS_LIBS) \
$(BOOST_RANDOM_LIBS) \
$(RESOLV_LIBS)