diff options
| author | David Robillard <d@drobilla.net> | 2011-11-13 03:54:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-11-13 03:54:29 +0000 |
| commit | bf8f0b2cb5cd41be9f709cb0cc2a445ec339d5f8 (patch) | |
| tree | bc54f29d91c1713e9ce4587e085813835558ff1e /gtk2_ardour/wscript | |
| parent | 420780f5fcc43d060bad166286dca85a651d9be8 (diff) | |
Apply patch from timbyr to fix building with --test.
git-svn-id: svn://localhost/ardour2/branches/3.0@10561 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index cedf442e95..3ca85c0e4d 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -267,6 +267,7 @@ def configure(conf): 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') + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.4', mandatory=False) conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -392,12 +393,12 @@ def build(bld): if bld.is_defined('VST_SUPPORT'): obj.source += [ 'vst_pluginui.cc' ] obj.defines += [ 'VST_SUPPORT' ] - bld.env.append ('LINKFLAGS', '-lX11') + obj.uselib += ' X11 ' if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'lxvst_pluginui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] - obj.linkflags += [ '-lX11' ] + obj.uselib += ' X11 ' if bld.is_defined('PHONE_HOME'): obj.defines += [ 'PHONE_HOME' ] |