summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-02-27 16:29:21 +0200
committerUoti Urpala <uau@mplayer2.org>2012-02-27 16:46:56 +0200
commit9ab501443c37888ee0d286897ebb985b2056ba49 (patch)
treed300ec816d1154a7fe8f6da1890ff25b4a94b6ef /configure
parent8d20859716db53fb6a2aa4975c8172a9d6aa7a3d (diff)
downloadmpv-9ab501443c37888ee0d286897ebb985b2056ba49.tar.bz2
mpv-9ab501443c37888ee0d286897ebb985b2056ba49.tar.xz
configure, ao_alsa: drop support for obsolete ALSA versions
Drop compatibility code for ALSA versions prior to 1.0.9. Change the configure check to use pkg-config only.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure107
1 files changed, 9 insertions, 98 deletions
diff --git a/configure b/configure
index df7058aa73..ad4e1f9b46 100755
--- a/configure
+++ b/configure
@@ -4950,100 +4950,18 @@ if test "$_alloca" != yes ; then
_alsa=no
res_comment="alloca missing"
fi
-if test "$_alsa" != no ; then
- _alsa=no
- cat > $TMPC << EOF
-#include <sys/asoundlib.h>
-#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5))
-#error "alsa version != 0.5.x"
-#endif
-int main(void) { return 0; }
-EOF
- cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.5.x'
-
- cat > $TMPC << EOF
-#include <sys/asoundlib.h>
-#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9))
-#error "alsa version != 0.9.x"
-#endif
-int main(void) { return 0; }
-EOF
- cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-sys'
- cat > $TMPC << EOF
-#include <alsa/asoundlib.h>
-#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9))
-#error "alsa version != 0.9.x"
-#endif
-int main(void) { return 0; }
-EOF
- cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-alsa'
-
- cat > $TMPC << EOF
-#include <sys/asoundlib.h>
-#if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0))
-#error "alsa version != 1.0.x"
-#endif
-int main(void) { return 0; }
-EOF
- cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-sys'
- cat > $TMPC << EOF
-#include <alsa/asoundlib.h>
-#if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0))
-#error "alsa version != 1.0.x"
-#endif
-int main(void) { return 0; }
-EOF
- cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa'
+if test "$_alsa" = auto ; then
+ _alsa=no
+ if pkg_config_add "alsa >= 1.0.9" ; then
+ _alsa=yes
+ fi
fi
def_alsa='#undef CONFIG_ALSA'
-def_alsa5='#undef CONFIG_ALSA5'
-def_alsa9='#undef CONFIG_ALSA9'
-def_alsa1x='#undef CONFIG_ALSA1X'
-def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
-def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
-if test "$_alsaver" ; then
- _alsa=yes
- if test "$_alsaver" = '0.5.x' ; then
- _alsa5=yes
- aomodules="alsa5 $aomodules"
- def_alsa5='#define CONFIG_ALSA5 1'
- def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
- res_comment="using alsa 0.5.x and sys/asoundlib.h"
- elif test "$_alsaver" = '0.9.x-sys' ; then
- _alsa9=yes
+if test "$_alsa" = yes ; then
aomodules="alsa $aomodules"
def_alsa='#define CONFIG_ALSA 1'
- def_alsa9='#define CONFIG_ALSA9 1'
- def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
- res_comment="using alsa 0.9.x and sys/asoundlib.h"
- elif test "$_alsaver" = '0.9.x-alsa' ; then
- _alsa9=yes
- aomodules="alsa $aomodules"
- def_alsa='#define CONFIG_ALSA 1'
- def_alsa9='#define CONFIG_ALSA9 1'
- def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
- res_comment="using alsa 0.9.x and alsa/asoundlib.h"
- elif test "$_alsaver" = '1.0.x-sys' ; then
- _alsa1x=yes
- aomodules="alsa $aomodules"
- def_alsa='#define CONFIG_ALSA 1'
- def_alsa1x="#define CONFIG_ALSA1X 1"
- def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
- res_comment="using alsa 1.0.x and sys/asoundlib.h"
- elif test "$_alsaver" = '1.0.x-alsa' ; then
- _alsa1x=yes
- aomodules="alsa $aomodules"
- def_alsa='#define CONFIG_ALSA 1'
- def_alsa1x="#define CONFIG_ALSA1X 1"
- def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
- res_comment="using alsa 1.0.x and alsa/asoundlib.h"
- else
- _alsa=no
- res_comment="unknown version"
- fi
- extra_ldflags="$extra_ldflags -lasound $_ld_dl $_ld_pthread"
else
- noaomodules="alsa $noaomodules"
+ noaomodules="alsa $noaomodules"
fi
echores "$_alsa"
@@ -6115,7 +6033,7 @@ echocheck "Radio interface"
if test "$_radio" = yes ; then
def_radio='#define CONFIG_RADIO 1'
inputmodules="radio $inputmodules"
- if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then
+ if test "$_alsa" != yes -a "$_ossaudio" != yes ; then
_radio_capture=no
fi
if test "$_radio_capture" = yes ; then
@@ -6508,9 +6426,7 @@ NEED_VSSCANF = $need_vsscanf
# features
3DFX = $_3dfx
AA = $_aa
-ALSA1X = $_alsa1x
-ALSA9 = $_alsa9
-ALSA5 = $_alsa5
+ALSA = $_alsa
APPLE_IR = $_apple_ir
APPLE_REMOTE = $_apple_remote
ARTS = $_arts
@@ -6720,13 +6636,11 @@ $def_dvdcss
/* system headers */
$def_alloca_h
-$def_alsa_asoundlib_h
$def_altivec_h
$def_malloc_h
$def_mman_h
$def_mman_has_map_failed
$def_soundcard_h
-$def_sys_asoundlib_h
$def_sys_soundcard_h
$def_sys_sysinfo_h
$def_sys_videoio_h
@@ -6853,9 +6767,6 @@ $def_xmms
/* Audio output drivers */
$def_alsa
-$def_alsa1x
-$def_alsa5
-$def_alsa9
$def_arts
$def_coreaudio
$def_dart