Mercurial > mplayer.hg
changeset 23314:4ec3dd8f6093
Merge internal and external VIDIX checks.
| author | diego |
|---|---|
| date | Thu, 17 May 2007 21:13:41 +0000 |
| parents | d2f0839dc721 |
| children | 39c0107471df |
| files | configure |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu May 17 20:55:12 2007 +0000 +++ b/configure Thu May 17 21:13:41 2007 +0000 @@ -7203,20 +7203,18 @@ linux && _def_linux='#define TARGET_LINUX 1' # TODO cleanup the VIDIX stuff here -echocheck "VIDIX (internal)" -echores "$_vidix_internal" - -echocheck "VIDIX (external)" -if test "$_vidix_external" = auto; then +echocheck "VIDIX" +if test "$_vidix_internal" = yes; then + _res_comment="internal" + _vidix_external=no +elif test "$_vidix_external" = auto; then _vidix_external=no cat > $TMPC <<EOF #include <vidix/vidix.h> int main(void) { return 0; } EOF - cc_check -lvidix && _vidix_external=yes -fi -echores "$_vidix_external" - + cc_check -lvidix && _vidix_external=yes && _res_comment="external" +fi if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then _vidix=yes _def_vidix='#define CONFIG_VIDIX 1' @@ -7224,6 +7222,7 @@ _vidix=no _def_vidix='#undef CONFIG_VIDIX' fi +echores "$_vidix" if test "$_vidix" = yes ; then if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e cyberblade`; then