pyrox.dev
1diff --git a/SConstruct b/SConstruct
2index ca5d5cf..76738e3 100644
3--- a/SConstruct
4+++ b/SConstruct
5@@ -354,7 +354,7 @@ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and co
6 env['PYUIC4'] = True
7 build_mixer = True
8
9-if conf.CheckForApp( 'xdg-desktop-menu --help' ):
10+if conf.CheckForApp( 'which xdg-desktop-menu' ):
11 env['XDG_TOOLS'] = True
12 else:
13 print """
14diff --git a/support/dbus/SConscript b/support/dbus/SConscript
15index 2b0f0c6..23069d8 100644
16--- a/support/dbus/SConscript
17+++ b/support/dbus/SConscript
18@@ -44,6 +44,7 @@ if not env.GetOption( "clean" ):
19 env.MergeFlags( env['LIBXML26_FLAGS'] )
20 else:
21 env.PrependUnique( LIBS=["expat"] )
22+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
23
24 env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml')
25 env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml')
26diff --git a/support/firmware/SConscript b/support/firmware/SConscript
27index 2939cb0..307b295 100644
28--- a/support/firmware/SConscript
29+++ b/support/firmware/SConscript
30@@ -36,6 +36,7 @@ if not env.GetOption( "clean" ):
31 env.MergeFlags( env['LIBXML26_FLAGS'] )
32 else:
33 env.PrependUnique( LIBS=["expat"] )
34+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
35
36 static_env = env.Clone()
37
38diff --git a/support/tools/SConscript b/support/tools/SConscript
39index 651621d..01b11f4 100644
40--- a/support/tools/SConscript
41+++ b/support/tools/SConscript
42@@ -36,6 +36,7 @@ if not e.GetOption( "clean" ):
43 e.MergeFlags( env['LIBXML26_FLAGS'] )
44 else:
45 e.PrependUnique( LIBS=["expat"] )
46+ e.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
47
48 #
49 # For the the ffado-diag tools
50diff --git a/tests/SConscript b/tests/SConscript
51index 307341f..4800b93 100644
52--- a/tests/SConscript
53+++ b/tests/SConscript
54@@ -35,6 +35,7 @@ if not env.GetOption( "clean" ):
55 env.MergeFlags( env['LIBXML26_FLAGS'] )
56 else:
57 env.PrependUnique( LIBS=["expat"] )
58+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
59
60 static_env = env.Clone()
61