minor fixes for clang++

[senf.git] / SConscript

diff --git a/SConscript b/SConscript
index db03adb..9542fa9 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -1,6 +1,9 @@
+# -*- python -*-
+
 Import('env')
 
-env['ALLOBJECTS'] = []
+env.Replace( ALLOBJECTS = [], PACKET_BUNDLES = [] )
+env.SetDefault( ALLBUNDLES = '$LOCALLIBDIR/AllBundles${OBJADDSUFFIX}${OBJSUFFIX}' )
 
 SConscript('senf/SConscript')
 
@@ -9,14 +12,16 @@ libsenf = env.Library("$LOCALLIBDIR/${LIBSENF}${LIBADDSUFFIX}", env['ALLOBJECTS'
 env.Default(libsenf)
 env.Install('$LIBINSTALLDIR', libsenf)
 
-conf = env.CreateFile("${LOCALLIBDIR}/${LIBSENF}${LIBADDSUFFIX}.conf", 
-                      env.Value(env.subst("$_CPPDEFFLAGS")))
+env.SetDefault(
+    _BOOST_EXT_INC_OPT = "${NEED_BOOST_EXT and '-I$$SENFINCDIR/boost_ext' or ''}")
+
+conf = env.CreateFile("${LOCALLIBDIR}/${LIBSENF}${LIBADDSUFFIX}.conf",
+                      env.Value(env.subst('$_BOOST_EXT_INC_OPT $_CPPDEFFLAGS')))
 env.Default(conf)
 env.Install('$CONFINSTALLDIR', conf)
 
-# AllBundles:
+### AllBundles:
 cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
                               NAME="AllBundles")
 env.Default(cobject)
 env.Install('${OBJINSTALLDIR}', cobject)
-        
\ No newline at end of file