From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 25 May 2011 21:18:40 +0000 (+0000)
Subject: remove dependency on external libgnomecanvas, since we have our own version in the... 
X-Git-Tag: 3.0-alpha5~13
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=b45b3460b93ae956c751b4d7a5e93bb8dd7049ba;p=ardour.git

remove dependency on external libgnomecanvas, since we have our own version in the tree

git-svn-id: svn://localhost/ardour2/branches/3.0@9590 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a7467377e3..ee76b17b23 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -254,8 +254,8 @@ def configure(conf):
                       atleast_version='2.18')
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
                       atleast_version='2.18')
-    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
-                      uselib_store='GNOMECANVASMM', atleast_version='2.16')
+    #autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
+    #                  uselib_store='GNOMECANVASMM', atleast_version='2.16')
     autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
 
     conf.check_tool('misc') # subst tool
@@ -309,7 +309,7 @@ def build(bld):
         obj.target = 'ardour-3.0'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
     obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL'
-    obj.uselib       += ' GTKMM GNOMECANVASMM '
+    obj.uselib       += ' GTKMM ' # GNOMECANVASMM
     obj.uselib       += ' AUDIOUNITS OSX GTKOSX '
     obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
                           libgtkmm2ext libtaglib libgnomecanvas-2'''