]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #838 from xinglin/boost-program-option-check
authorSage Weil <sage@inktank.com>
Sat, 30 Nov 2013 06:25:28 +0000 (22:25 -0800)
committerSage Weil <sage@inktank.com>
Sat, 30 Nov 2013 06:25:28 +0000 (22:25 -0800)
autoconf: add check for the boost_program_options library

Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
1  2 
configure.ac
src/tools/Makefile.am

diff --cc configure.ac
Simple merge
index db86067c0bef14665d2fc014be7525b6b6cf29eb,44dff92b1624bb4869ff5c37397795ee14158f07..901f172ec2c17ab0143f7563e3360920bcfaae50
@@@ -12,15 -12,8 +12,15 @@@ ceph_kvstore_tool_CXXFLAGS = $(UNITTEST
  bin_DEBUGPROGRAMS += ceph-kvstore-tool
  
  
 +ceph_filestore_tool_SOURCES = tools/ceph-filestore-tool.cc
 +ceph_filestore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options
 +if LINUX
 +ceph_filestore_tool_LDADD += -ldl
 +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