Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1073 diff -u -p -r1.1073 configure --- configure 5 Oct 2005 19:52:13 -0000 1.1073 +++ configure 8 Oct 2005 05:28:46 -0000 @@ -4678,31 +4678,46 @@ if test "$_alsa" != no ; then _alsa=no cat > $TMPC << EOF #include -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 -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 -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 -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 -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'