1.1 --- a/configure.in	Wed Jun 25 10:40:45 2008 +0000
     1.2 +++ b/configure.in	Sun Jun 29 22:54:59 2008 +0000
     1.3 @@ -39,6 +39,10 @@
     1.4     [], [with_osmesa=no])
     1.5  AC_ARG_WITH( gtk,
     1.6     AS_HELP_STRING( [--with-gtk], [Build with the GTK UI. Default on X11 systems]), [with_gtk=yes], [with_gtk=x11] )
     1.7 +AC_ARG_WITH( esd,
     1.8 +   AS_HELP_STRING( [--with-esd], [Build with support for the ESounD audio system]) )
     1.9 +AC_ARG_WITH( pulse,
    1.10 +   AS_HELP_STRING( [--with-pulse], [Build with support for the PulseAudio audio system]) )
    1.11  
    1.12  dnl ------------ Check if we're building on Darwin --------------
    1.13  
    1.14 @@ -164,17 +168,31 @@
    1.15  AM_CONDITIONAL( AUDIO_OSX, [test "$HAVE_CORE_AUDIO" = 'yes'] )
    1.16  
    1.17  dnl Check for pulseaudio
    1.18 -PKG_CHECK_MODULES(PULSE, [libpulse-simple], [
    1.19 -     HAVE_PULSE='yes'
    1.20 -     AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    1.21 -     AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) ], [true])
    1.22 +if test "x$with_pulse" != "xno"; then
    1.23 +   PKG_CHECK_MODULES(PULSE, [libpulse-simple], [
    1.24 +       HAVE_PULSE='yes'
    1.25 +       AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    1.26 +       AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) 
    1.27 +   ], [
    1.28 +       if test "x$with_pulse" = "xyes"; then
    1.29 +          AC_MSG_FAILURE( [PulseAudio audio package could not be found (but was required)] )
    1.30 +       fi
    1.31 +   ])
    1.32 +fi
    1.33  AM_CONDITIONAL( AUDIO_PULSE, [test "$HAVE_PULSE" = 'yes'] )
    1.34  
    1.35  dnl Check for esound
    1.36 -PKG_CHECK_MODULES(ESOUND, [esound], [ 
    1.37 -     HAVE_ESOUND='yes'
    1.38 -     AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
    1.39 -     AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], [true])
    1.40 +if test "x$with_esd" != "xno"; then
    1.41 +   PKG_CHECK_MODULES(ESOUND, [esound], [ 
    1.42 +       HAVE_ESOUND='yes'
    1.43 +       AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
    1.44 +       AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) 
    1.45 +   ], [
    1.46 +       if test "x$with_esd" = "xyes"; then
    1.47 +          AC_MSG_FAILURE( [ESounD audio package could not be found (but was required)] )
    1.48 +       fi
    1.49 +   ])
    1.50 +fi
    1.51  AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )
    1.52  
    1.53  dnl Check for alsa support