diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-17 21:13:41 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-17 21:13:41 +0000 |
commit | f998479792e4a9bacfe4df5723869c0dc1b39ce6 (patch) | |
tree | 2e1ce3c5000bf6491bfa4f6599f5b3f37f107f4b /configure | |
parent | ebc9066be99b5a188e11483cad5789bc76e90ada (diff) | |
download | mpv-f998479792e4a9bacfe4df5723869c0dc1b39ce6.tar.bz2 mpv-f998479792e4a9bacfe4df5723869c0dc1b39ce6.tar.xz |
Merge internal and external VIDIX checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23332 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -7203,20 +7203,18 @@ _def_linux='#undef TARGET_LINUX' 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 + cc_check -lvidix && _vidix_external=yes && _res_comment="external" fi -echores "$_vidix_external" - if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then _vidix=yes _def_vidix='#define CONFIG_VIDIX 1' @@ -7224,6 +7222,7 @@ else _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 |