Changeset 718

Show
Ignore:
Timestamp:
04/24/10 11:20:28 (2 years ago)
Author:
conrad
Message:

configure: fix disabling of alsa, pulse

Fix the behaviour of --disable-alsa, --disable-pulse so that these
configurations are valid; only warn that they are missing if not
disabled; and add a warning if pulse is desired but missing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/configure.ac

    r717 r718  
    349349    sweep_config_driver="$sweep_config_driver PulseAudio" 
    350350  fi 
     351else 
     352  HAVE_PULSEAUDIO=disabled 
    351353fi 
    352354 
    …… 
    361363    sweep_config_driver="$sweep_config_driver ALSA" 
    362364  fi 
     365else 
     366  HAVE_ALSA=disabled 
    363367fi 
    364368 
    …… 
    375379    fi 
    376380  fi 
     381else 
     382  HAVE_OSS=disabled 
    377383fi 
    378384 
    …… 
    539545fi 
    540546 
    541 if test "x$HAVE_ALSA" = xmaybe ; then 
     547if test "x${ac_enable_alsa}" != xno ; then 
     548  if test "x$HAVE_ALSA" != xyes ; then 
     549    AC_MSG_RESULT([ 
     550*** alsa-lib version 1.0.0 or greater, available from 
     551*** http://alsa-project.org/ 
     552]) 
     553  fi 
     554  if test "x$HAVE_ALSA" = xmaybe ; then 
    542555    AC_MSG_RESULT([ 
    543556      Development files missing: alsa-lib 1.0.0 or greater seems to exist 
    …… 
    545558      build information. 
    546559]) 
    547 fi 
    548  
    549 if test "x$HAVE_ALSA" != xyes ; then 
    550   AC_MSG_RESULT([ 
    551 *** alsa-lib version 1.0.0 or greater, available from 
    552 *** http://alsa-project.org/ 
    553 ]) 
     560  fi 
     561fi 
     562 
     563if test "x${ac_enable_pulseaudio}" != xno ; then 
     564  if test "x$HAVE_PULSEAUDIO" != xyes ; then 
     565    AC_MSG_RESULT([ 
     566*** PulseAudio, available from http://pulseaudio.org/ 
     567]) 
     568  fi 
    554569fi 
    555570