diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-02-07 10:33:30 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-02-07 10:33:30 +0000 |
| commit | 7cf18befaa6309a60c5950b5f349204f267f88f4 (patch) | |
| tree | 045b389bb8924dbf3c5fb28bb1be2e870f6cf241 /configure.ac | |
| parent | 9bf85f976ca1c539788e6d1d60995434eb856812 (diff) | |
| download | pcsxr-7cf18befaa6309a60c5950b5f349204f267f88f4.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@41219 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index b8dc01d5..0c509154 100644 --- a/configure.ac +++ b/configure.ac @@ -48,15 +48,24 @@ then fi AM_CONDITIONAL(HAVE_OSS, false) +AM_CONDITIONAL(HAVE_PULSEAUDIO, false) +AM_CONDITIONAL(HAVE_PULSEAUDIOSIMPLE, false) -dnl Check for ALSA 0.9.x +dnl Check for ALSA 1.x, OSS, or PulseAudio AC_ARG_ENABLE(alsa, [ --enable-alsa use ALSA sound output (default=no)], [ BUILD_ALSA="$enableval" ],[ BUILD_ALSA="no" ]) +AC_ARG_ENABLE(pulseaudio, [ --enable-pulseaudio use PulseAudio sound output (default=no)], +[ BUILD_PULSEAUDIO="$enableval" ],[ BUILD_PULSEAUDIO="no" ]) +AC_ARG_ENABLE(pasimple, [ --enable-pasimple use PulseAudio simple sound output (default=no)], +[ BUILD_PULSEAUDIOSIMPLE="$enableval" ],[ BUILD_PULSEAUDIOSIMPLE="no" ]) if test "$BUILD_ALSA" = "yes"; then - AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) - AC_CHECK_HEADER(alsa/asoundlib.h, , have_alsa=no) + PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, have_alsa=yes, have_alsa=no) +elif test "$BUILD_PULSEAUDIOSIMPLE" = "yes"; then + PKG_CHECK_MODULES(PULSEAUDIO, libpulse-simple >= 0.9.16, have_pulseaudiosimple=yes) +elif test "$BUILD_PULSEAUDIO" = "yes"; then + PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= 0.9.16, have_pulseaudio=yes) else AC_CHECK_HEADER(sys/soundcard.h, have_oss=yes, have_oss=no) if test "x$have_oss" = xno; then @@ -66,14 +75,12 @@ else fi fi -if test "x$have_alsa" = xyes; then - ALSA_LIBS="-lasound" -else - ALSA_LIBS="" -fi - AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes) AC_SUBST(ALSA_LIBS) +AM_CONDITIONAL(HAVE_PULSEAUDIOSIMPLE,test "x$have_pulseaudiosimple" = xyes) +AM_CONDITIONAL(HAVE_PULSEAUDIO,test "x$have_pulseaudio" = xyes) +AC_SUBST(PULSEAUDIO_CFLAGS) +AC_SUBST(PULSEAUDIO_LIBS) AC_CHECK_HEADER(zlib.h, have_zlib=yes, have_zlib=no) if test "x$have_zlib" = xno; then |