diff options
| author | Daniel Burrows <Daniel Burrows Daniel_Burrows@alumni.brown.edu> | 2010-05-20 22:10:21 -0700 |
|---|---|---|
| committer | Daniel Burrows <Daniel Burrows Daniel_Burrows@alumni.brown.edu> | 2010-05-20 22:10:21 -0700 |
| commit | 25bf38007c8ba0b71cccc25e03c53380912f33c5 (patch) | |
| tree | 95429441c84c2607c7a400a25f156c2835234580 | |
| parent | 807cec77e03264f40a899986827592344c02d6ec (diff) | |
| download | aptitude-25bf38007c8ba0b71cccc25e03c53380912f33c5.tar.gz | |
Move the SCons configure check for boost::fusion::fold into the main build environment instead of the tests build environment.
This is a definite "oops"; it should have been there
all along, but I saw "Boost" and zeroed in on the wrong
part of the program.
| -rw-r--r-- | site_scons/aptitude_configure.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/site_scons/aptitude_configure.py b/site_scons/aptitude_configure.py index 4572b6bd..52b6de58 100644 --- a/site_scons/aptitude_configure.py +++ b/site_scons/aptitude_configure.py @@ -82,6 +82,15 @@ all executable targets need.""" "Can't find the POSIX thread libraries.") RequireCheck(conf.CheckForBoostIOStreams(), "Can't find Boost.IOStreams") + + if conf.CheckBoostFusionFoldArgumentOrder(True): + pass + elif conf.CheckBoostFusionFoldArgumentOrder(False): + conf.Define('BOOST_FUSION_FOLD_STATE_BEFORE_VALUE') + else: + print "Can't figure out how to invoke boost::fusion::fold" + Exit(1) + if conf.CheckDDTP(): conf.Define('HAVE_DDTP', 1) conf.CheckGTK() @@ -121,14 +130,6 @@ the Boost unit tests need.''' RequireCheck(conf.CheckForBoostTest(), "Can't find Boost.Test") - if conf.CheckBoostFusionFoldArgumentOrder(True): - pass - elif conf.CheckBoostFusionFoldArgumentOrder(False): - conf.Define('BOOST_FUSION_FOLD_STATE_BEFORE_VALUE') - else: - print "Can't figure out how to invoke boost::fusion::fold" - Exit(1) - conf.Finish() def DoConfigureCppunitTests(env): |