1.1 --- a/configure	Sun Jun 29 03:51:33 2008 +0000
     1.2 +++ b/configure	Sun Jun 29 22:31:40 2008 +0000
     1.3 @@ -809,6 +809,8 @@
     1.4  enable_sh4stats
     1.5  with_osmesa
     1.6  with_gtk
     1.7 +with_esd
     1.8 +with_pulse
     1.9  '
    1.10        ac_precious_vars='build_alias
    1.11  host_alias
    1.12 @@ -1478,6 +1480,8 @@
    1.13    --with-osmesa           Build with the osmesa GL library (software
    1.14                            rendering)
    1.15    --with-gtk              Build with the GTK UI. Default on X11 systems
    1.16 +  --with-esd              Build with support for the ESounD audio system
    1.17 +  --with-pulse            Build with support for the PulseAudio audio system
    1.18  
    1.19  Some influential environment variables:
    1.20    CC          C compiler command
    1.21 @@ -6597,6 +6601,18 @@
    1.22  fi
    1.23  
    1.24  
    1.25 +# Check whether --with-esd was given.
    1.26 +if test "${with_esd+set}" = set; then
    1.27 +  withval=$with_esd;
    1.28 +fi
    1.29 +
    1.30 +
    1.31 +# Check whether --with-pulse was given.
    1.32 +if test "${with_pulse+set}" = set; then
    1.33 +  withval=$with_pulse;
    1.34 +fi
    1.35 +
    1.36 +
    1.37  
    1.38  lxdream_save_cppflags="$CPPFLAGS"
    1.39  CPPFLAGS="$CPPFLAGS -x objective-c"
    1.40 @@ -8803,6 +8819,7 @@
    1.41  fi
    1.42  
    1.43  
    1.44 +if test "x$with_pulse" != "xno"; then
    1.45  
    1.46  pkg_failed=no
    1.47  { $as_echo "$as_me:$LINENO: checking for PULSE" >&5
    1.48 @@ -8864,22 +8881,40 @@
    1.49  
    1.50  	{ $as_echo "$as_me:$LINENO: result: no" >&5
    1.51  $as_echo "no" >&6; }
    1.52 -                true
    1.53 +
    1.54 +       if test "x$with_pulse" = "xyes"; then
    1.55 +          { { $as_echo "$as_me:$LINENO: error: PulseAudio audio package could not be found (but was required)
    1.56 +See \`config.log' for more details." >&5
    1.57 +$as_echo "$as_me: error: PulseAudio audio package could not be found (but was required)
    1.58 +See \`config.log' for more details." >&2;}
    1.59 +   { (exit 1); exit 1; }; }
    1.60 +       fi
    1.61 +
    1.62  elif test $pkg_failed = untried; then
    1.63 -	true
    1.64 +
    1.65 +       if test "x$with_pulse" = "xyes"; then
    1.66 +          { { $as_echo "$as_me:$LINENO: error: PulseAudio audio package could not be found (but was required)
    1.67 +See \`config.log' for more details." >&5
    1.68 +$as_echo "$as_me: error: PulseAudio audio package could not be found (but was required)
    1.69 +See \`config.log' for more details." >&2;}
    1.70 +   { (exit 1); exit 1; }; }
    1.71 +       fi
    1.72 +
    1.73  else
    1.74  	PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
    1.75  	PULSE_LIBS=$pkg_cv_PULSE_LIBS
    1.76          { $as_echo "$as_me:$LINENO: result: yes" >&5
    1.77  $as_echo "yes" >&6; }
    1.78  
    1.79 -     HAVE_PULSE='yes'
    1.80 -     AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    1.81 +       HAVE_PULSE='yes'
    1.82 +       AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    1.83  
    1.84  cat >>confdefs.h <<\_ACEOF
    1.85  #define HAVE_PULSE 1
    1.86  _ACEOF
    1.87  
    1.88 +
    1.89 +fi
    1.90  fi
    1.91  
    1.92  
    1.93 @@ -8892,6 +8927,7 @@
    1.94  fi
    1.95  
    1.96  
    1.97 +if test "x$with_esd" != "xno"; then
    1.98  
    1.99  pkg_failed=no
   1.100  { $as_echo "$as_me:$LINENO: checking for ESOUND" >&5
   1.101 @@ -8953,22 +8989,40 @@
   1.102  
   1.103  	{ $as_echo "$as_me:$LINENO: result: no" >&5
   1.104  $as_echo "no" >&6; }
   1.105 -                true
   1.106 +
   1.107 +       if test "x$with_esd" = "xyes"; then
   1.108 +          { { $as_echo "$as_me:$LINENO: error: ESounD audio package could not be found (but was required)
   1.109 +See \`config.log' for more details." >&5
   1.110 +$as_echo "$as_me: error: ESounD audio package could not be found (but was required)
   1.111 +See \`config.log' for more details." >&2;}
   1.112 +   { (exit 1); exit 1; }; }
   1.113 +       fi
   1.114 +
   1.115  elif test $pkg_failed = untried; then
   1.116 -	true
   1.117 +
   1.118 +       if test "x$with_esd" = "xyes"; then
   1.119 +          { { $as_echo "$as_me:$LINENO: error: ESounD audio package could not be found (but was required)
   1.120 +See \`config.log' for more details." >&5
   1.121 +$as_echo "$as_me: error: ESounD audio package could not be found (but was required)
   1.122 +See \`config.log' for more details." >&2;}
   1.123 +   { (exit 1); exit 1; }; }
   1.124 +       fi
   1.125 +
   1.126  else
   1.127  	ESOUND_CFLAGS=$pkg_cv_ESOUND_CFLAGS
   1.128  	ESOUND_LIBS=$pkg_cv_ESOUND_LIBS
   1.129          { $as_echo "$as_me:$LINENO: result: yes" >&5
   1.130  $as_echo "yes" >&6; }
   1.131  
   1.132 -     HAVE_ESOUND='yes'
   1.133 -     AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
   1.134 +       HAVE_ESOUND='yes'
   1.135 +       AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
   1.136  
   1.137  cat >>confdefs.h <<\_ACEOF
   1.138  #define HAVE_ESOUND 1
   1.139  _ACEOF
   1.140  
   1.141 +
   1.142 +fi
   1.143  fi
   1.144  
   1.145  

     2.1 --- a/configure.in	Sun Jun 29 03:51:33 2008 +0000
     2.2 +++ b/configure.in	Sun Jun 29 22:31:40 2008 +0000
     2.3 @@ -39,6 +39,10 @@
     2.4     [], [with_osmesa=no])
     2.5  AC_ARG_WITH( gtk,
     2.6     AS_HELP_STRING( [--with-gtk], [Build with the GTK UI. Default on X11 systems]), [with_gtk=yes], [with_gtk=x11] )
     2.7 +AC_ARG_WITH( esd,
     2.8 +   AS_HELP_STRING( [--with-esd], [Build with support for the ESounD audio system]) )
     2.9 +AC_ARG_WITH( pulse,
    2.10 +   AS_HELP_STRING( [--with-pulse], [Build with support for the PulseAudio audio system]) )
    2.11  
    2.12  dnl ------------ Check if we're building on Darwin --------------
    2.13  
    2.14 @@ -164,17 +168,31 @@
    2.15  AM_CONDITIONAL( AUDIO_OSX, [test "$HAVE_CORE_AUDIO" = 'yes'] )
    2.16  
    2.17  dnl Check for pulseaudio
    2.18 -PKG_CHECK_MODULES(PULSE, [libpulse-simple], [
    2.19 -     HAVE_PULSE='yes'
    2.20 -     AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    2.21 -     AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) ], [true])
    2.22 +if test "x$with_pulse" != "xno"; then
    2.23 +   PKG_CHECK_MODULES(PULSE, [libpulse-simple], [
    2.24 +       HAVE_PULSE='yes'
    2.25 +       AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    2.26 +       AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) 
    2.27 +   ], [
    2.28 +       if test "x$with_pulse" = "xyes"; then
    2.29 +          AC_MSG_FAILURE( [PulseAudio audio package could not be found (but was required)] )
    2.30 +       fi
    2.31 +   ])
    2.32 +fi
    2.33  AM_CONDITIONAL( AUDIO_PULSE, [test "$HAVE_PULSE" = 'yes'] )
    2.34  
    2.35  dnl Check for esound
    2.36 -PKG_CHECK_MODULES(ESOUND, [esound], [ 
    2.37 -     HAVE_ESOUND='yes'
    2.38 -     AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
    2.39 -     AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], [true])
    2.40 +if test "x$with_esd" != "xno"; then
    2.41 +   PKG_CHECK_MODULES(ESOUND, [esound], [ 
    2.42 +       HAVE_ESOUND='yes'
    2.43 +       AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
    2.44 +       AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) 
    2.45 +   ], [
    2.46 +       if test "x$with_esd" = "xyes"; then
    2.47 +          AC_MSG_FAILURE( [ESounD audio package could not be found (but was required)] )
    2.48 +       fi
    2.49 +   ])
    2.50 +fi
    2.51  AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )
    2.52  
    2.53  dnl Check for alsa support