RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #838 from xinglin/boost-program-option-check

Browse Source 
autoconf: add check for the boost_program_options library

Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
This commit is contained in:
Sage Weil 2013-11-29 22:25:28 -08:00
commit 51cd75080d
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -562,6 +562,19 @@ AC_CHECK_LIB(boost_thread-mt, main, [],
[AC_CHECK_LIB(boost_thread, main, [],
AC_MSG_FAILURE(["Boost thread library not found."]))])
#
# Check for boost_program_options library (defines BOOST_PROGRAM_OPTIONS_LIBS).
#
BOOST_PROGRAM_OPTIONS_LIBS=""
saved_LIBS="${LIBS}"
LIBS=""
AC_CHECK_LIB(boost_program_options-mt, main, [],
[AC_CHECK_LIB(boost_program_options, main, [],
AC_MSG_FAILURE(["Boost program options library not found."]))])
BOOST_PROGRAM_OPTIONS_LIBS="${LIBS}"
LIBS="${saved_LIBS}"
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIBS)
AC_LANG([C])
AC_CHECK_MEMBER([struct fiemap_extent.fe_logical],

10
src/test/Makefile.am
View File

@ -130,7 +130,7 @@ ceph_smalliobench_SOURCES = \
test/bench/rados_backend.cc \
test/bench/detailed_stat_collector.cc \
test/bench/bencher.cc
ceph_smalliobench_LDADD = $(LIBRADOS) -lboost_program_options $(CEPH_GLOBAL)
ceph_smalliobench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL)
bin_DEBUGPROGRAMS += ceph_smalliobench
ceph_smalliobenchfs_SOURCES = \
@ -138,7 +138,7 @@ ceph_smalliobenchfs_SOURCES = \
test/bench/testfilestore_backend.cc \
test/bench/detailed_stat_collector.cc \
test/bench/bencher.cc
ceph_smalliobenchfs_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL)
ceph_smalliobenchfs_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL)
bin_DEBUGPROGRAMS += ceph_smalliobenchfs
ceph_smalliobenchdumb_SOURCES = \
@ -146,7 +146,7 @@ ceph_smalliobenchdumb_SOURCES = \
test/bench/dumb_backend.cc \
test/bench/detailed_stat_collector.cc \
test/bench/bencher.cc
ceph_smalliobenchdumb_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL)
ceph_smalliobenchdumb_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL)
bin_DEBUGPROGRAMS += ceph_smalliobenchdumb
ceph_smalliobenchrbd_SOURCES = \
@ -154,13 +154,13 @@ ceph_smalliobenchrbd_SOURCES = \
test/bench/rbd_backend.cc \
test/bench/detailed_stat_collector.cc \
test/bench/bencher.cc
ceph_smalliobenchrbd_LDADD = $(LIBRBD) $(LIBRADOS) -lboost_program_options $(CEPH_GLOBAL)
ceph_smalliobenchrbd_LDADD = $(LIBRBD) $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL)
bin_DEBUGPROGRAMS += ceph_smalliobenchrbd
ceph_tpbench_SOURCES = \
test/bench/tp_bench.cc \
test/bench/detailed_stat_collector.cc
ceph_tpbench_LDADD = $(LIBRADOS) -lboost_program_options $(LIBOS) $(CEPH_GLOBAL)
ceph_tpbench_LDADD = $(LIBRADOS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBOS) $(CEPH_GLOBAL)
bin_DEBUGPROGRAMS += ceph_tpbench
ceph_omapbench_SOURCES = test/omap_bench.cc

6
src/tools/Makefile.am
View File

@ -1,9 +1,9 @@
ceph_osdomap_tool_SOURCES = tools/ceph-osdomap-tool.cc
ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options
ceph_osdomap_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS)
bin_DEBUGPROGRAMS += ceph-osdomap-tool
ceph_monstore_tool_SOURCES = tools/ceph-monstore-tool.cc
ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options
ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS)
bin_DEBUGPROGRAMS += ceph-monstore-tool
ceph_kvstore_tool_SOURCES = tools/ceph-kvstore-tool.cc
@ -20,7 +20,7 @@ endif # LINUX
bin_PROGRAMS += ceph_filestore_tool
ceph_filestore_dump_SOURCES = tools/ceph-filestore-dump.cc
ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options
ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS)
if LINUX
ceph_filestore_dump_LDADD += -ldl
endif # LINUX