X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=f63873b361c33e72da619464f05064308da355df;hb=1ff86abcd6cd22bffcab7967b0bf7495e83a0de5;hp=38c82b6409c3cc3d50c24b14f4f0c47b994054e8;hpb=4123b4fe58a7fd4659fa01476581690b47c83600;p=senf.git

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 38c82b6..f63873b 100644
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -79,7 +79,7 @@ def SetupForSENF(env, senf_path = []):
     env.Append(
         LIBS              = [ 'rt' ],
         
-        CXXFLAGS          = [ '-Wno-long-long', '$CXXFLAGS_' ],
+        CXXFLAGS          = [ '-Wno-long-long', '$CXXFLAGS_', '-fno-strict-aliasing' ],
         CXXFLAGS_         = BuildTypeOptions('CXXFLAGS'),
         
         CPPDEFINES        = [ '$expandLogOption', '$CPPDEFINES_' ],
@@ -171,9 +171,9 @@ def SetupForSENF(env, senf_path = []):
 def DefaultOptions(env):
     env.Append(
         CXXFLAGS         = [ '-Wall', '-Woverloaded-virtual' ],
-        CXXFLAGS_final   = [ '-O2' ],
-        CXXFLAGS_normal  = [ '-O0', '-g' ],
-        CXXFLAGS_debug   = [ '$CXXFLAGS_normal' ],
+        CXXFLAGS_final   = [ '-O3' ],
+        CXXFLAGS_normal  = [ '-O2', '-g' ],
+        CXXFLAGS_debug   = [ '-O0', '-g' ],
 
         LINKFLAGS_normal = [ '-Wl,-S' ],
         LINKFLAGS_debug  = [ '-g' ],
@@ -196,11 +196,16 @@ def Glob(env, exclude=[], subdirs=[]):
 
 
 def Configure(env):
-    conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
+    conf = env.Configure(clean=False, 
+                         help=False, 
+                         custom_tests=senfconf.Tests(), 
+                         config_h="#/senf/autoconf.hh")
     env.Replace(
         BOOST_VERSION  =  conf.CheckBoostVersion(),
         BOOST_VARIANT  = conf.CheckBoostVariants( '', 'mt' ),
         NEED_BOOST_EXT = not conf.CheckCXXHeader("boost/bimap.hpp"),
+        HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP = conf.CheckCXXHeader(
+            "boost/spirit/include/classic.hpp"),
     )
     conf.Finish()