summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2009-09-03 19:38:25 -0700
committerDaniel Burrows <dburrows@debian.org>2009-09-03 19:38:25 -0700
commit06bcc65948e96adbf098628b4dd6e257a7c2868d (patch)
tree098077ec5f8fdddeb00395ad55ba6da4d7bb580d
parent36a75bb6d835fee90f896897fd913a2a8faf5c25 (diff)
downloadaptitude-06bcc65948e96adbf098628b4dd6e257a7c2868d.tar.gz
Fix the check for Boost.IOStream so that it works with the new Boost version in unstable.
The new Boost dropped the "-mt" suffix from the library name. The new check will find either the "-mt" version or the non-"-mt" version, preferring the one with "-mt". Hopefully the new Debian compile really is multithreaded and the maintainer didn't just forget to enable a threaded build...
-rw-r--r--m4/ax_boost_iostreams.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
index ba866ce9..40d39f97 100644
--- a/m4/ax_boost_iostreams.m4
+++ b/m4/ax_boost_iostreams.m4
@@ -74,7 +74,8 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
if test "x$ax_boost_user_iostreams_lib" = "x"; then
for ax_lib in $BN-mt $BN-$CC-mt $BN-$CC-mt-s \
lib$BN-mt lib$BN-$CC-mt lib$BN-$CC-mt-s \
- $BN-mgw-mt $BN-mgw-mt-s ; do
+ $BN-mgw-mt $BN-mgw-mt-s \
+ $BN $BN-$CC $BN-$CC-s lib$BN lib$BN-$CC lib$BN-$CC-s ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes" break],
[link_iostreams="no"])
done