Changeset 1512

Show
Ignore:
Timestamp:
12/25/08 11:04:49 (12 years ago)
Author:
arnonym
Message:
  • Somehow there where two checks for the xdg-tools. One is enough.
  • Reword the failure message for the mixers a bit.
  • Don't touch the tests-dir when BUILD_TESTS is false. See #189
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r1498 r1512  
    294294""" 
    295295 
    296 if conf.CheckForApp( "xdg-desktop-menu --help" ): 
    297         env['XDG_TOOLS'] = True 
    298 else: 
    299         print """ 
    300 I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 
    301 this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffadomixer". 
    302 """ 
    303  
    304296if not build_mixer and not env.GetOption('clean'): 
    305297        print """ 
    306298I couldn't find all the prerequisites ('pyuic' / 'pyuic4' and the python-modules 'dbus' and 
    307 'qt', the packages could be named like dbus-python and PyQt) to build the mixer. 
    308 Therefor the mixer won't get installed. 
     299'qt' / 'PyQt4', the packages could be named like dbus-python and PyQt) to build the mixer. 
     300Therefor neither the qt3 nor the qt4 mixer will get installed. 
    309301""" 
    310302 
     
    561553env.Install( env['sharedir'], 'configuration' ) 
    562554 
    563 subdirs=['external','src','libffado','tests','support','doc'] 
     555subdirs=['external','src','libffado','support','doc'] 
     556if env['BUILD_TESTS']: 
     557        subdirs.append('tests') 
     558 
    564559if build_base: 
    565560        env.SConscript( dirs=subdirs, exports="env", build_dir=build_base+subdir )