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 b6453b187393d79c7f10396d2c5f70931b20a236..90bbd90c0fa6f14975a880dec174247507170395 100644 (file)
--- 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 a20d0ec52f67bc96a40b044d8f5f39aba5940f38..03d6c747561ca583c9892d815589fb5a1cf36241 100644 (file)
--- 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