Merge lp:~mordred/drizzle/bug728581 into lp:drizzle/7.0

Proposed by Monty Taylor
Status: Merged
Approved by: Brian Aker
Approved revision: 2217
Merged at revision: 2219
Proposed branch: lp:~mordred/drizzle/bug728581
Merge into: lp:drizzle/7.0
Diff against target: 11 lines (+2/-0)
1 file modified
m4/pandora_have_libboost_filesystem.m4 (+2/-0)
To merge this branch: bzr merge lp:~mordred/drizzle/bug728581
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+52148@code.launchpad.net

Description of the change

Flips the filesystem deprecated API flag. We need to use this to continue using the v2 api on newer boosts until all of our older boosts are new enough to use v3. Sigh.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/pandora_have_libboost_filesystem.m4'
2--- m4/pandora_have_libboost_filesystem.m4 2010-09-20 09:18:16 +0000
3+++ m4/pandora_have_libboost_filesystem.m4 2011-03-03 23:58:54 +0000
4@@ -28,6 +28,8 @@
5 AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM,
6 [test "x${ac_cv_libboost_filesystem}" = "xyes" -o "x${ac_cv_libboost_filesystem_mt}" = "xyes"])
7 BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_FILESYSTEM_MT} ${LTLIBBOOST_FILESYSTEM}"
8+ AC_DEFINE([BOOST_FILESYSTEM_DEPRECATED], [1],
9+ [Use the v2 interface until we can stop using old versions])
10 AC_SUBST(BOOST_LIBS)
11 ])
12

Subscribers

People subscribed via source and target branches