Changeset 1816

Show
Ignore:
Timestamp:
04/27/10 14:34:59 (11 years ago)
Author:
arnonym
Message:

Support more minimalistic installations:

When the dbus-devel-stuff is not found, the dbus-server is not built. Of course this stops the mixer (if it can be built) from being usable. But when you don't need that because the device doesn't need/have mixer control, this simplifies things for low-disk-space systems...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/external/SConscript

    r1336 r1816  
    11# 
    2 # Copyright (C) 2007-2008 Arnold Krille 
    3 # Copyright (C) 2007-2008 Pieter Palmers 
     2# Copyright (C) 2007, 2008, 2010 Arnold Krille 
     3# Copyright (C) 2007, 2008 Pieter Palmers 
    44# 
    55# This file is part of FFADO 
    …… 
    2626env = env.Clone() 
    2727 
    28 env.SConscript( dirs=["dbus", "libconfig"], exports="env" ) 
     28dirs=['libconfig'] 
    2929 
     30if env['DBUS1_FLAGS']: 
     31    dirs.append('dbus') 
     32 
     33env.SConscript( dirs=dirs, exports="env" ) 
     34 

  • trunk/libffado/SConstruct

    r1763 r1816  
    11#! /usr/bin/python 
    22# 
    3 # Copyright (C) 2007-2008 Arnold Krille 
    4 # Copyright (C) 2007-2008 Pieter Palmers 
     3# Copyright (C) 2007, 2008, 2010 Arnold Krille 
     4# Copyright (C) 2007, 2008 Pieter Palmers 
    55# Copyright (C) 2008 Jonathan Woithe 
    66# 
    …… 
    217217    # 
    218218    allpresent = 1; 
    219     # for DBUS C++ bindings 
     219    # for DBUS C++ bindings and cache-serialization. 
    220220    allpresent &= conf.CheckHeader( "expat.h" ) 
    221221    allpresent &= conf.CheckLib( 'expat', 'XML_ExpatVersion', '#include <expat.h>' ) 
    222      
     222 
    223223    pkgs = { 
    224224        'libraw1394' : '1.3.0', 
    225225        'libiec61883' : '1.1.0', 
    226         'dbus-1' : '1.0', 
    227226        } 
    228227 
    …… 
    301300""" 
    302301 
    303 # ALSA checks 
    304 pkg = 'alsa' 
    305 name2 = pkg.replace("+","").replace(".","").replace("-","").upper() 
    306 env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, '1.0.0' ) 
     302# 
     303# Optional pkg-config 
     304# 
     305pkgs = { 
     306    'alsa': '0', 
     307    'dbus-1': '1.0', 
     308    } 
     309for pkg in pkgs: 
     310    name2 = pkg.replace("+","").replace(".","").replace("-","").upper() 
     311    env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] ) 
    307312 
    308313# 
    309314# Get the directory where dbus stores the service-files 
    310315# 
    311 env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip() 
     316if env['DBUS1_FLAGS']: 
     317    env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip() 
     318    # this is required to indicate that the DBUS version we use has support 
     319    # for platform dependent threading init functions 
     320    # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is 
     321    # always true 
     322    env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" ) 
     323else: 
     324    print """ 
     325The dbus-headers where not found. The dbus-server for ffado will therefor not be built. 
     326""" 
    312327 
    313328config_guess = conf.ConfigGuess() 
    …… 
    328343    env.MergeFlags( "-Werror" ) 
    329344 
    330  
    331 # this is required to indicate that the DBUS version we use has support 
    332 # for platform dependent threading init functions 
    333 # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is 
    334 # always true 
    335 env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" ) 
    336345 
    337346if env['ENABLE_ALL']: 
    …… 
    381390env.Alias( "install", env['sharedir'] ) 
    382391env.Alias( "install", env['bindir'] ) 
    383 env.Alias( "install", env['pypkgdir'] ) 
     392if build_mixer: 
     393    env.Alias( "install", env['pypkgdir'] ) 
    384394 
    385395# 

  • trunk/libffado/support/SConscript

    r1638 r1816  
    11# 
    2 # Copyright (C) 2007-2008 Arnold Krille 
    3 # Copyright (C) 2007-2008 Pieter Palmers 
     2# Copyright (C) 2007, 2008, 2010 Arnold Krille 
     3# Copyright (C) 2007, 2008 Pieter Palmers 
    44# 
    55# This file is part of FFADO 
    …… 
    2626env = env.Clone() 
    2727 
    28 env.SConscript( dirs=["mixer-qt4","firmware","dbus","tools","alsa"], exports="env" ) 
     28dirs=["mixer-qt4","firmware","tools","alsa"] 
     29 
     30if env['DBUS1_FLAGS']: 
     31    dirs.append('dbus') 
     32 
     33env.SConscript( dirs=dirs, exports="env" ) 
     34 
     35# vim: et