From b08470f0bfedeabf51a41b2cba60225e677cb09d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 27 Jul 2014 16:58:08 -0700 Subject: [PATCH] configure.ac: link libboost_thread only with json-spirit Signed-off-by: Sage Weil --- configure.ac | 6 ++++++ src/json_spirit/Makefile.am | 1 + 2 files changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 7a81d82ceb791..26f2dda41c8c9 100644 --- a/configure.ac +++ b/configure.ac @@ -626,9 +626,15 @@ AC_CHECK_LIB(boost_system-mt, main, [], AC_MSG_NOTICE(["Boost system library not found."]))]) # Find the right boost_thread library. +BOOST_THREAD_LIBS="" +saved_LIBS="${LIBS}" +LIBS="" AC_CHECK_LIB(boost_thread-mt, main, [], [AC_CHECK_LIB(boost_thread, main, [], AC_MSG_FAILURE(["Boost thread library not found."]))]) +BOOST_THREAD_LIBS="${LIBS}" +LIBS="${saved_LIBS}" +AC_SUBST(BOOST_THREAD_LIBS) # # Check for boost_program_options library (defines BOOST_PROGRAM_OPTIONS_LIBS). diff --git a/src/json_spirit/Makefile.am b/src/json_spirit/Makefile.am index 9b82ec4706cad..f14228cb0627e 100644 --- a/src/json_spirit/Makefile.am +++ b/src/json_spirit/Makefile.am @@ -1,6 +1,7 @@ libjson_spirit_la_SOURCES = \ json_spirit/json_spirit_reader.cpp \ json_spirit/json_spirit_writer.cpp +libjson_spirit_la_LIBADD = $(BOOST_THREAD_LIBS) noinst_LTLIBRARIES += libjson_spirit.la noinst_HEADERS += \ -- 2.39.5