part 2 of 3 of the 2.8 -> 3.0 merge

[ardour.git] / libs / pbd / SConscript

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index 87173f0874768bdfb7c0ce24e7ef59d4bf3bc99a..51a852fd443e925d912386d9285c148697061d3d 100644 (file)
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env libraries i18n install_prefix')
 
-pbd = env.Copy()
+pbd = env.Clone()
 
 domain = 'libpbd'
 
@@ -45,6 +45,7 @@ strsplit.cc
 textreceiver.cc
 transmitter.cc
 undo.cc
+uuid.cc
 version.cc
 whitespace.cc
 xml++.cc
@@ -53,12 +54,19 @@ xml++.cc
 conf = Configure(pbd)
 if conf.CheckFunc('getmntent'):
     conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT")
+if conf.CheckCHeader('execinfo.h'):
+    conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
 pbd = conf.Finish()
 
 pbd.Merge ([ libraries['sigc2'],
              libraries['xml'],
+             libraries['uuid'],
              libraries['glibmm2'],
-             libraries['glib2'] ])
+             libraries['glib2'],
+             libraries['boost'] ])
+
+if pbd['VST']:
+    pbd.Append(CCFLAGS="-DWINE_THREAD_SUPPORT", CPPPATH="#libs/fst")
 
 pbd.VersionBuild(['version.cc','pbd/version.h'], [])