From 54c09b137a192995542e922bfb0f7a1925c28ecd Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 2 Dec 2012 19:49:01 +0000
Subject: add -DBOOST_SYSTEM_NO_DEPRECATED when building anything using boost
 to avoid linkage issues with boost 1.50 and above

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13590 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 SConstruct                                | 3 ++-
 gtk2_ardour/SConscript                    | 6 ++++--
 libs/ardour/SConscript                    | 3 ++-
 libs/pbd/SConscript                       | 1 +
 libs/surfaces/control_protocol/SConscript | 3 ++-
 libs/surfaces/mackie/SConscript           | 3 ++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index 429e8fb843..7ad8cdfe45 100644
--- a/SConstruct
+++ b/SConstruct
@@ -85,6 +85,7 @@ class LibraryInfo(Environment):
             self.Append (CPPPATH = other.get('CPPPATH', []))
             self.Append (LINKFLAGS = other.get('LINKFLAGS', []))
             self.Append (CCFLAGS = other.get('CCFLAGS', []))
+            self.Append (CXXFLAGS = other.get('CXXFLAGS', []))
 	self.Replace(LIBPATH = list(Set(self.get('LIBPATH', []))))
 	self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[]))))
         #doing LINKFLAGS breaks -framework
@@ -992,7 +993,7 @@ if env['WIIMOTE']:
 
 libraries['boost'] = LibraryInfo ()
 prep_libcheck(env, libraries['boost'])
-libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")
+libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib",CCFLAGS="-DBOOST_SYSTEM_NO_DEPRECATED",CXXFLAGS="-DBOOST_SYSTEM_NO_DEPRECATED")
 conf = Configure (libraries['boost'])
 if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
         print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can."
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index c8942f42e6..6deebaae11 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -54,7 +54,8 @@ gtkardour.Merge ([
     libraries['vamphost'],
     libraries['vamp'],
     libraries['xml'],
-    libraries['xslt']
+    libraries['xslt'],
+    libraries['boost']
 ])
 
 gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
@@ -67,7 +68,8 @@ gtkmmtests.Merge ([
     libraries['gtk2'],
     libraries['gtkmm2'],
     libraries['pangomm'],
-    libraries['sigc2']
+    libraries['sigc2'],
+    libraries['boost']
 ])
 
 if gtkardour['DMALLOC']:
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 5603d53934..e2449bd1e1 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -333,7 +333,8 @@ ardour.Merge ([
 	     libraries['sndfile'],
 	     libraries['vamp'],
 	     libraries['vamphost'],
-	     libraries['xml']
+	     libraries['xml'],
+             libraries['boost']
 	     ])
 
 if ardour['RUBBERBAND']:
diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index c9751e80ac..23691450e6 100644
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -59,6 +59,7 @@ if conf.CheckCHeader('execinfo.h'):
 pbd = conf.Finish()
 
 pbd.Merge ([ libraries['sigc2'],
+             libraries['boost'],
              libraries['xml'],
              libraries['glibmm2'],
              libraries['glib2'] ])
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index 4ae3406b8f..b5f6239762 100644
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -40,7 +40,8 @@ cp.Merge ([
     libraries['midi++2'],
     libraries['xml'],
     libraries['glib2'],
-    libraries['glibmm2']
+    libraries['glibmm2'],
+    libraries['boost']
 	])
 
 libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
index 6dcab460df..7546b55f3d 100644
--- a/libs/surfaces/mackie/SConscript
+++ b/libs/surfaces/mackie/SConscript
@@ -63,7 +63,8 @@ mackie.Merge ([
     libraries['xml'],
     libraries['glib2'],
     libraries['glibmm2'],
-    libraries['sndfile']
+    libraries['sndfile'],
+    libraries['boost']
     ])
 
 libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files)
-- 
cgit v1.2.3