Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e Modified Files: configure.in Log Message: Optionally use PulseAudio to play sounds. =================================================================== RCS file: /cvs/e/e16/e/configure.in,v retrieving revision 1.251 retrieving revision 1.252 diff -u -3 -r1.251 -r1.252 --- configure.in 23 Feb 2008 11:50:22 -0000 1.251 +++ configure.in 1 Mar 2008 15:22:32 -0000 1.252 @@ -88,26 +88,43 @@ [ --enable-sound compile with sound support @<:@default=yes@:>@],, enable_sound=yes) if test "x$enable_sound" = "xyes"; then - AC_ARG_ENABLE(sound_esd, - [ --enable-sound-esd compile with EsounD sound support @<:@default=yes@:>@],, - enable_sound_esd=yes) + AC_ARG_ENABLE(sound_pulse, + [ --enable-sound-pulse compile with PulseAudio sound support @<:@default=no@:>@],, + enable_sound_pulse=no) + AC_ARG_ENABLE(sound_esound, + [ --enable-sound-esound compile with EsounD sound support @<:@default=yes@:>@],, + enable_sound_esound=yes) fi enable_sound=no -if test "x$enable_sound_esd" = "xyes"; then +if test "x$enable_sound_pulse" = "xyes"; then + PKG_CHECK_MODULES(PA, libpulse,, enable_sound_pulse=no) +fi +if test "x$enable_sound_pulse" = "xyes"; then + AC_DEFINE(HAVE_SOUND, 1, [Sound support]) + AC_DEFINE(HAVE_SOUND_PA, 1, [PulseAudio sound support]) + AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader]) + PKG_CHECK_MODULES(AUDIOFILE, audiofile,,) + enable_sound=pulseaudio + enable_sound_esound=no + PA_LIBS="$PA_LIBS $AUDIOFILE_LIBS" +fi +AM_CONDITIONAL(USE_LIBPA, test "x$enable_sound_pulse" = "xyes") + +if test "x$enable_sound_esound" = "xyes"; then AM_PATH_ESD(0.2.17,,[ - enable_sound_esd=no - AC_MSG_WARN([ESD Sound support was requested but not found.]) + enable_sound_esound=no + AC_MSG_WARN([EsounD sound support was requested but not found.]) ]) - AC_CHECK_HEADERS(audiofile.h,, enable_sound_esd=no) + AC_CHECK_HEADERS(audiofile.h,, enable_sound_esound=no) fi -if test "x$enable_sound_esd" = "xyes"; then +if test "x$enable_sound_esound" = "xyes"; then AC_DEFINE(HAVE_SOUND, 1, [Sound support]) AC_DEFINE(HAVE_SOUND_ESD, 1, [EsounD sound support]) AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader]) - enable_sound=esd + enable_sound=esound fi -AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esd" = "xyes") +AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes") CPPFLAGS="$X_CFLAGS $CPPFLAGS" LDFLAGS="$X_LIBS $LDFLAGS -L$prefix/lib" ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs