diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-18 21:34:54 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-18 21:34:54 +0000 |
| commit | 408e0a5764f41ab1cfdcfe7e13967c636851feca (patch) | |
| tree | 9e9234782e06c528a5b960d24ff4ab80c112f00d /configure | |
| parent | d95e6a4df7430c0dbcf8eba7da84ef0e9d7cd324 (diff) | |
| download | mpv-408e0a5764f41ab1cfdcfe7e13967c636851feca.tar.bz2 mpv-408e0a5764f41ab1cfdcfe7e13967c636851feca.tar.xz | |
modify alsa version detection so that it don't require running the generated binary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16801 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 35 |
1 files changed, 25 insertions, 10 deletions
@@ -4687,31 +4687,46 @@ if test "$_alsa" != no ; then _alsa=no cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); } +#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 && $TMPO && _alsaver='0.5.x' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.5.x' cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } +#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 && $TMPO && _alsaver='0.9.x-sys' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-sys' cat > $TMPC << EOF #include <alsa/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } +#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 && $TMPO && _alsaver='0.9.x-alsa' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-alsa' cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } +#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 && $TMPO && _alsaver='1.0.x-sys' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-sys' cat > $TMPC << EOF #include <alsa/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } +#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 && $TMPO && _alsaver='1.0.x-alsa' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' fi _def_alsa5='#undef HAVE_ALSA5' _def_alsa9='#undef HAVE_ALSA9' |