From: Sage Weil <sage@inktank.com>
Date: Sat, 30 Nov 2013 06:25:28 +0000 (-0800)
Subject: Merge pull request #838 from xinglin/boost-program-option-check
X-Git-Tag: v0.74~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51cd75080db6a71136a6feafb30a0e4b88cd1e2e;p=ceph.git

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

autoconf: add check for the boost_program_options library

Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
---

51cd75080db6a71136a6feafb30a0e4b88cd1e2e
diff --cc src/tools/Makefile.am
index db86067c0bef,44dff92b1624..901f172ec2c1
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@@ -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