On Sunday 27 February 2005 12:09, Chris Cannam wrote:
> On Sunday 27 Feb 2005 10:54, Guillaume Laurent wrote:
> > > Aha, seems working, but I have ALSA, liblrdf and dssi installed,
> > > and scons only recognizes ALSA.
> >
> > Yes, lib detection isn't perfected yet (or I don't know how to use it
> > properly)
>
> Hm, well it is obviously kind of fundamental that we should be able to
> easily add in dependencies for other libraries.  That's about the only
> thing I find easy to do with autoconf.

Patch attached. It tests for a minimal ALSA library version, and corrects 
another few tests.

Regards,
Pedro

Index: SConstruct
===================================================================
RCS file: /cvsroot/rosegarden/rosegarden/SConstruct,v
retrieving revision 1.2
diff -u -r1.2 SConstruct
--- SConstruct	26 Feb 2005 23:29:21 -0000	1.2
+++ SConstruct	27 Feb 2005 11:40:42 -0000
@@ -23,16 +23,17 @@
 ##
 ## Configure stuff    
 conf = Configure(env)
-conf.CheckLibWithHeader('alsa', 'seq.h', 'C')
+haveAlsa    = conf.CheckLibWithHeader('asound', 'alsa/asoundlib.h', 'C', 'snd_seq_port_info_set_timestamp_queue(0,0);')
 haveJack    = conf.CheckLib('jack')
 haveLadspa  = conf.CheckHeader('ladspa.h')
 haveLiblo   = conf.CheckLib('lo')
-haveLibrdf  = conf.CheckLib('rdf')
+haveLibrdf  = conf.CheckLib('lrdf')
 haveLibmad  = conf.CheckLib('mad')
-haveLibdssi = conf.CheckLib('dssi')
+haveLibdssi = conf.CheckHeader('dssi.h')
 env = conf.Finish()
 
-env.Append(CCFLAGS = '-DHAVE_ALSA')
+if haveAlsa:
+    env.Append(CCFLAGS = '-DHAVE_ALSA')
 env.Append(CCFLAGS = '-DQT_THREAD_SUPPORT')
 if haveJack:
     env.Append(CCFLAGS = '-DHAVE_JACK')

Reply via email to