Index: /trunk/libffado/external/SConscript
===================================================================
--- /trunk/libffado/external/SConscript (revision 1336)
+++ /trunk/libffado/external/SConscript (revision 1816)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 Arnold Krille
-# Copyright (C) 2007-2008 Pieter Palmers
+# Copyright (C) 2007, 2008, 2010 Arnold Krille
+# Copyright (C) 2007, 2008 Pieter Palmers
 #
 # This file is part of FFADO
@@ -26,4 +26,9 @@
 env = env.Clone()
 
-env.SConscript( dirs=["dbus", "libconfig"], exports="env" )
+dirs=['libconfig']
 
+if env['DBUS1_FLAGS']:
+    dirs.append('dbus')
+
+env.SConscript( dirs=dirs, exports="env" )
+
Index: /trunk/libffado/SConstruct
===================================================================
--- /trunk/libffado/SConstruct (revision 1763)
+++ /trunk/libffado/SConstruct (revision 1816)
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 #
-# Copyright (C) 2007-2008 Arnold Krille
-# Copyright (C) 2007-2008 Pieter Palmers
+# Copyright (C) 2007, 2008, 2010 Arnold Krille
+# Copyright (C) 2007, 2008 Pieter Palmers
 # Copyright (C) 2008 Jonathan Woithe
 #
@@ -217,12 +217,11 @@
     #
     allpresent = 1;
-    # for DBUS C++ bindings
+    # for DBUS C++ bindings and cache-serialization.
     allpresent &= conf.CheckHeader( "expat.h" )
     allpresent &= conf.CheckLib( 'expat', 'XML_ExpatVersion', '#include <expat.h>' )
-    
+
     pkgs = {
         'libraw1394' : '1.3.0',
         'libiec61883' : '1.1.0',
-        'dbus-1' : '1.0',
         }
 
@@ -301,13 +300,29 @@
 """
 
-# ALSA checks
-pkg = 'alsa'
-name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
-env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, '1.0.0' )
+#
+# Optional pkg-config
+#
+pkgs = {
+    'alsa': '0',
+    'dbus-1': '1.0',
+    }
+for pkg in pkgs:
+    name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
+    env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
 
 #
 # Get the directory where dbus stores the service-files
 #
-env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip()
+if env['DBUS1_FLAGS']:
+    env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip()
+    # this is required to indicate that the DBUS version we use has support
+    # for platform dependent threading init functions
+    # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is
+    # always true
+    env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" )
+else:
+    print """
+The dbus-headers where not found. The dbus-server for ffado will therefor not be built.
+"""
 
 config_guess = conf.ConfigGuess()
@@ -328,10 +343,4 @@
     env.MergeFlags( "-Werror" )
 
-
-# this is required to indicate that the DBUS version we use has support
-# for platform dependent threading init functions
-# this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is
-# always true
-env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" )
 
 if env['ENABLE_ALL']:
@@ -381,5 +390,6 @@
 env.Alias( "install", env['sharedir'] )
 env.Alias( "install", env['bindir'] )
-env.Alias( "install", env['pypkgdir'] )
+if build_mixer:
+    env.Alias( "install", env['pypkgdir'] )
 
 #
Index: /trunk/libffado/support/SConscript
===================================================================
--- /trunk/libffado/support/SConscript (revision 1638)
+++ /trunk/libffado/support/SConscript (revision 1816)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 Arnold Krille
-# Copyright (C) 2007-2008 Pieter Palmers
+# Copyright (C) 2007, 2008, 2010 Arnold Krille
+# Copyright (C) 2007, 2008 Pieter Palmers
 #
 # This file is part of FFADO
@@ -26,3 +26,10 @@
 env = env.Clone()
 
-env.SConscript( dirs=["mixer-qt4","firmware","dbus","tools","alsa"], exports="env" )
+dirs=["mixer-qt4","firmware","tools","alsa"]
+
+if env['DBUS1_FLAGS']:
+    dirs.append('dbus')
+
+env.SConscript( dirs=dirs, exports="env" )
+
+# vim: et