summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-02-19 17:57:34 +0000
committerDavid Robillard <d@drobilla.net>2009-02-19 17:57:34 +0000
commit167150d9613b9fc5c3ba6365c2d89648e32f4905 (patch)
treea1e3974a4a46609af69ed5b9457ecfeb736bd595 /SConstruct
parent8a28ea6154f78d491afe746b3a2b0230185afb91 (diff)
Check for alsa correctly. Hopefully.
git-svn-id: svn://localhost/ardour2/branches/3.0@4639 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 1b4bc349b3..3b906a79f4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1054,7 +1054,7 @@ conf = Configure(env)
libraries['asound'] = LibraryInfo ()
if conf.CheckCHeader('alsa/asoundlib.h'):
- libraries['asound'] = LibraryInfo (LIBS='asound')
+ libraries['asound'].ParseConfig('pkg-config --cflags --libs alsa')
if conf.CheckCHeader('jack/midiport.h'):
libraries['sysmidi'] = LibraryInfo (LIBS='jack')
@@ -1064,7 +1064,8 @@ if conf.CheckCHeader('jack/midiport.h'):
env.Append(CCFLAGS=" -DWITH_JACK_MIDI")
print "Using JACK MIDI"
elif conf.CheckCHeader('alsa/asoundlib.h'):
- libraries['sysmidi'] = LibraryInfo (LIBS='asound')
+ libraries['sysmidi'] = LibraryInfo ()
+ libraries['sysmidi'].ParseConfig('pkg-config --cflags --libs alsa')
env['SYSMIDI'] = 'ALSA Sequencer'
subst_dict['%MIDITAG%'] = "seq"
subst_dict['%MIDITYPE%'] = "alsa/sequencer"