--- SConstruct	2008-01-03 16:34:08.000000000 +0000
+++ SConstruct	2008-01-03 16:36:00.000000000 +0000
@@ -54,6 +54,7 @@
 opts.Add('BIDI', 'BIDI support', '')
 
 env = Environment(ENV=os.environ, options=opts)
+env.SConsignFile(".sconsign")
 env['LIBDIR_SCHEMA'] = LIBDIR_SCHEMA
 
 Help(opts.GenerateHelpText(env))
@@ -165,9 +166,9 @@
 # Setup the c++ args for our own codebase
 
 if env['DEBUG']:
-    env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O0 -fno-inline -g -pthread -DDEBUG -DMAPNIK_DEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
+    env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -fno-inline -g -pthread -DDEBUG -DMAPNIK_DEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
 else:
-    env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O3 -finline-functions -Wno-inline -pthread -DNDEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
+    env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -finline-functions -Wno-inline -pthread -DNDEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
 
 # Build agg first, doesn't need anything special