You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@qpid.apache.org by ac...@apache.org on 2008/10/16 17:44:17 UTC

svn commit: r705263 - in /incubator/qpid/trunk/qpid/cpp: configure.ac src/Makefile.am

Author: aconway
Date: Thu Oct 16 08:44:16 2008
New Revision: 705263

URL: http://svn.apache.org/viewvc?rev=705263&view=rev
Log:
configure.ac: check for presence of libboost_threads vs. libboost_threads-mt

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?rev=705263&r1=705262&r2=705263&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Thu Oct 16 08:44:16 2008
@@ -163,6 +163,9 @@
 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"

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=705263&r1=705262&r2=705263&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Thu Oct 16 08:44:16 2008
@@ -216,7 +216,6 @@
 libqpidcommon_la_LIBADD = \
   -lboost_program_options \
   -lboost_filesystem \
-  -lboost_thread-mt \
   -luuid \
   $(LIB_DLOPEN) \
   $(LIB_CLOCK_GETTIME)