revert previous commit

git-svn-id: svn://localhost/ardour2/branches/3.0@9591 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-05-25 21:28:17 +00:00
parent b45b3460b9
commit e394642910

View File

@ -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'''