diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
| commit | 30968b854257cb5f9159ca59589f783c85615601 (patch) | |
| tree | 81b105c877dd91745b5e06835cc063ad5d6d0a51 /wscript | |
| parent | 44564654fd825f198946d0f189421f9e569f68a6 (diff) | |
| parent | cd6cbba29934bb8045640250e09325a5554d5cfe (diff) | |
merge with master, including manual merge conflict resolution
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -43,7 +43,6 @@ children = [ 'libs/audiographer', 'libs/canvas', 'gtk2_ardour', - 'templates', 'export', 'midi_maps', 'mcp', @@ -610,6 +609,7 @@ def configure(conf): autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2') autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') + autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26') conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') |