diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-07-31 14:47:24 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-07-31 14:47:24 +0000 |
| commit | 0e91a5bc3a848675f4043cb9826f8f5f69264531 (patch) | |
| tree | ac782c9d8965aa00f5646496cee745506efa8951 /configure.ac | |
| parent | 18c5ecf77162abf61b191b30127c47a3c050aac4 (diff) | |
| download | xine-lib-0e91a5bc3a848675f4043cb9826f8f5f69264531.tar.gz xine-lib-0e91a5bc3a848675f4043cb9826f8f5f69264531.tar.bz2 | |
Check for ALSA >= 1.0.9 (HAVE_ALSA_1_0_9).
Rework the existing checks (common code) and simplify slightly.
CVS patchset: 7703
CVS date: 2005/07/31 14:47:24
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dea08fb7d..da72db3b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1254,12 +1254,16 @@ 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 and more installed]) + AC_DEFINE(HAVE_ALSA09,1,[Define this if you have ALSA 0.9.x or later installed]) + fi + if test x"$have_alsa_1_0_9" = "xyes"; then + AC_DEFINE(HAVE_ALSA_1_0_9,1,[Define this if you have ALSA 1.0.9 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") +AM_CONDITIONAL(HAVE_ALSA_1_0_9, test x"$have_alsa_1_0_9" = "xyes") dnl --------------------------------------------- @@ -2813,8 +2817,10 @@ if test x"$have_ossaudio" = "xyes"; then echo " - oss (Open Sound System)" fi if test x"$no_alsa" != "xyes"; then - if test x"$have_alsa09" = "xyes"; then - echo " - alsa (Alsa 0.9.x)" + 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 fi if test x"$no_esd" != "xyes"; then |