From: John Coyle <dx9err@gmail.com>
Date: Tue, 8 Mar 2016 19:19:32 +0000 (-0500)
Subject: configure.ac: add _LIBS variables for boost_system and boost_iostreams
X-Git-Tag: ses5-milestone5~165^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6341f527cfe6760925bebfb2e41ce6ac6ba41d17;p=ceph.git

configure.ac: add _LIBS variables for boost_system and boost_iostreams

The checks were breaking downtstream checks for fallocate and others on Alpine.

Signed-off-by: John Coyle <dx9err@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index b6453b187393..90bbd90c0fa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -948,13 +948,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=""
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a20d0ec52f67..03d6c747561c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -168,6 +168,8 @@ LIBCOMMON_DEPS += \
 	$(LIBCOMPRESSOR) \
 	$(LIBMSG) $(LIBAUTH) \
 	$(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
+	$(BOOST_SYSTEM_LIBS) \
+	$(BOOST_IOSTREAMS_LIBS) \
 	$(BOOST_RANDOM_LIBS) \
 	$(RESOLV_LIBS) \
 	-luuid