mail[Wesnoth-commits] r25250 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 28, 2008 - 17:37:
Author: esr
Date: Fri Mar 28 17:37:02 2008
New Revision: 25250

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25250&view=rev
Log:
Set some defaults for the boost checking.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25250&r1=25249&r2=25250&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Fri Mar 28 17:37:02 2008
@@ -99,8 +99,7 @@
 
 def CheckBoostLib(context, boost_lib, require_version = None):
     env = context.env
-    boostdir = context.env.get("BOOSTDIR",
-                               os.path.join(context.env["prefix"], "boost"))
+    boostdir = context.env.get("BOOSTDIR", "/usr/include/boost"))
     backup = backup_env(env, ["CPPPATH", "LIBPATH", "LIBS"])
     env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [env["BOOSTLIBS"]])
 
@@ -143,7 +142,7 @@
     else:
         context.Message("Checking for Boost %s library... " % boost_lib)
     check_result = CheckBoostLib(context, boost_lib, require_version)
-    if not check_result and not context.env["BOOST_SUFFIX"]:
+    if not check_result and not context.env.get("BOOST_SUFFIX"):
         context.env["BOOST_SUFFIX"] = "-mt"
         check_result = CheckBoostLib(context, boost_lib, require_version)
     if check_result:




Related Messages


Powered by MHonArc, Updated Fri Mar 28 18:01:52 2008