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


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

Header


Content

Posted by loonycyborg on March 03, 2009 - 11:14:
Author: loonycyborg
Date: Tue Mar  3 11:14:01 2009
New Revision: 33304

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33304&view=rev
Log:
Added hints about build/config.log and --config=force.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=33304&r1=33303&r2=33304&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Tue Mar  3 11:14:01 2009
@@ -202,10 +202,6 @@
 # Check some preconditions
 #
 
-def Die(message):
-    print message
-    Exit(1)
-
 def Warning(message):
     print message
     return False
@@ -224,9 +220,9 @@
         conf.CheckBoostIostreamsGZip() and \
         conf.CheckBoost("smart_ptr", header_only = True) and \
         conf.CheckSDL(require_version = '1.2.7') and \
-        conf.CheckSDL('SDL_net') or Die("Base prerequisites are not met.")
-
-    have_client_prereqs = \
+        conf.CheckSDL('SDL_net') or Warning("Base prerequisites are not 
met.")
+
+    have_client_prereqs = have_server_prereqs and \
         conf.CheckPango("cairo") and \
         conf.CheckPKG("fontconfig") and \
         conf.CheckBoost("regex") and \
@@ -265,6 +261,9 @@
 #        Warning("Boost 1.35 not found using old networking code.i")
 #    
 #    env["have_boost_asio"] = have_boost_asio;
+
+    print "If any config checks fail, look in build/config.log for details"
+    print "If a check fails spuriously due to caching, use --config=force to 
force its rerun"
 
 else:
     have_client_prereqs = True




Related Messages


Powered by MHonArc, Updated Tue Mar 03 12:00:08 2009