diff options
| author | Alan Conway <aconway@apache.org> | 2008-10-16 15:44:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-10-16 15:44:16 +0000 |
| commit | f7a4f7bcf77726767d0905f56f5c44c7a34d82a3 (patch) | |
| tree | c9f87ccea03f92268b12c15110502b0462ea06c0 /cpp | |
| parent | 89a14d0b1a860ec7f2b167d16e743391774e4207 (diff) | |
| download | qpid-python-f7a4f7bcf77726767d0905f56f5c44c7a34d82a3.tar.gz | |
configure.ac: check for presence of libboost_threads vs. libboost_threads-mt
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@705263 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 3 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 02080d4c6f..160bb44f4b 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -163,6 +163,9 @@ AC_SUBST(DOWNLOAD_URL) AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],, AC_MSG_ERROR([Missing required header files.])) +# Link with whichever variant of libboost_thread is available. +AC_SEARCH_LIBS([_ZN5boost6thread4joinEv],[boost_thread-mt boost_thread],,[AC_MSG_ERROR([No boost thread library found])]) + # Check for optional CPG requirement. tmp_LIBS=$LIBS LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 888883c6ba..c63b98b18d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -216,7 +216,6 @@ EXTRA_DIST +=\ libqpidcommon_la_LIBADD = \ -lboost_program_options \ -lboost_filesystem \ - -lboost_thread-mt \ -luuid \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) |