From 874ba08fb4f3c620357c7a76e6eb5f2ed651ec6b Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Tue, 7 Mar 2006 06:23:12 +0000
Subject: [PATCH] 2006-03-04 Tim Mayberry <mojofunk@gmail.com>

	* Enable linking to system soundtouch library if SYSLIBS=1, soundtouch-1.3.1 needed for pkgconfig support
	* Fix to allow compiling against libgnomecanvasmm library when SYSLIBS=1


git-svn-id: svn://localhost/trunk/ardour2@354 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 SConstruct                              | 7 +++----
 gtk2_ardour/crossfade_view.h            | 2 +-
 gtk2_ardour/editor_tempodisplay.cc      | 2 +-
 gtk2_ardour/ghostregion.h               | 2 +-
 gtk2_ardour/imageframe_time_axis.h      | 2 +-
 gtk2_ardour/imageframe_time_axis_view.h | 2 +-
 gtk2_ardour/region_gain_line.h          | 2 +-
 gtk2_ardour/regionview.h                | 2 +-
 gtk2_ardour/time_axis_view.cc           | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/SConstruct b/SConstruct
index 2626554fff..c7378dcd70 100644
--- a/SConstruct
+++ b/SConstruct
@@ -435,11 +435,10 @@ if env['SYSLIBS']:
     libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
-    libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
-                                          LIBPATH='#libs/soundtouch',
-                                          CPPPATH=['#libs', '#libs/soundtouch'])
+    libraries['soundtouch'] = LibraryInfo()
+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+
     coredirs = [
-	'libs/soundtouch',
         'templates'
     ]
 
diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index f4676cf695..b4931c94c0 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -22,7 +22,7 @@
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <sigc++/signal.h>
 #include <ardour/crossfade.h>
 
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index aa7b45f4a9..3b70286bcc 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <climits>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include <pbd/error.h>
 
diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 0ca52a70e6..0255035ea1 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 #include <sigc++/signal.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include "canvas.h"
 #include "simplerect.h"
 
diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 5de011cae6..cefd0c5d09 100644
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -23,7 +23,7 @@
 
 #include <list>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h
index e97606d542..d51901d4e0 100644
--- a/gtk2_ardour/imageframe_time_axis_view.h
+++ b/gtk2_ardour/imageframe_time_axis_view.h
@@ -28,7 +28,7 @@
 
 #include <jack/jack.h>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include "canvas.h"
 #include "simplerect.h"
 
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 494dae3147..bf6de0d810 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -2,7 +2,7 @@
 #define __ardour_gtk_region_gain_line_h__
 
 #include <ardour/ardour.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include "automation_line.h"
 
diff --git a/gtk2_ardour/regionview.h b/gtk2_ardour/regionview.h
index 70c944f2da..cb71a8f3a7 100644
--- a/gtk2_ardour/regionview.h
+++ b/gtk2_ardour/regionview.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
 #include <ardour/region.h>
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 24e3b55837..add01e2572 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/canvas.h>
 #include <libgnomecanvasmm/item.h>