diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-10 22:43:50 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-10 22:43:50 +0000 |
| commit | 09e46dced401d8f28d19fe15f9349690d069728b (patch) | |
| tree | befa811de4ff6af55ba71dbceb59fb34ef0acaf2 /configure.ac | |
| parent | bfaac05a7d01a9f3a4cb66014026fa84e279df80 (diff) | |
| download | xine-lib-09e46dced401d8f28d19fe15f9349690d069728b.tar.gz xine-lib-09e46dced401d8f28d19fe15f9349690d069728b.tar.bz2 | |
Replace custom ALSA macro with a simpler PKG_CHECK_MODULES call, and assume requirement of 0.9.0 minimum. See SF.net bug 1394688.
CVS patchset: 8104
CVS date: 2006/07/10 22:43:50
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index aa077c1cb..484bac7e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1317,15 +1317,19 @@ dnl --------------------------------------------- dnl Alsa support dnl --------------------------------------------- -AM_PATH_ALSA(0.9.0rc4, - [ AC_DEFINE(HAVE_ALSA,1,[Define this if you have Alsa (libasound) installed]) - if test x"$have_alsa09" = "xyes"; then - AC_DEFINE(HAVE_ALSA09,1,[Define this if you have ALSA 0.9.x or later installed]) - fi - ], - AC_MSG_RESULT(*** All of ALSA dependent parts will be disabled ***)) -AM_CONDITIONAL(HAVE_ALSA, test x"$no_alsa" != "xyes") -AM_CONDITIONAL(HAVE_ALSA09, test x"$have_alsa09" = "xyes") +AC_ARG_WITH([alsa], + AS_HELP_STRING([--without-alsa], [Disable ALSA output plugin (default: check)])) + +if test "x$with_alsa" != "xno"; then + PKG_CHECK_MODULES([ALSA], [alsa >= 0.9.0], [have_alsa=yes], [have_alsa=no]) + if test "x$have_alsa" = "xyes"; then + AC_DEFINE([HAVE_ALSA], [1], [Define this if you have ALSA installed]) + elif test "x$with_alsa" = "xyes"; then + AC_MSG_ERROR([ALSA support requested but not found.]) + fi +fi + +AM_CONDITIONAL([HAVE_ALSA], [test "x$have_alsa" = "xyes"]) dnl --------------------------------------------- dnl ESD support @@ -2742,12 +2746,8 @@ echo " * audio driver plugins:" if test x"$have_ossaudio" = "xyes"; then echo " - oss (Open Sound System)" fi -if test x"$no_alsa" != "xyes"; then - if test x"$have_alsa_1_0_9" = "xyes"; then - echo " - alsa (ALSA >= 1.0.9)" - elif test x"$have_alsa09" = "xyes"; then - echo " - alsa (ALSA >= 0.9, < 1.0.9)" - fi +if test "x$have_alsa" = "xyes"; then + echo " - alsa" fi if test x"$no_esd" != "xyes"; then echo " - esd (Enlightened Sound Daemon)" |