Mercurial > mplayer.hg

comparison configure @ 23314:4ec3dd8f6093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge internal and external VIDIX checks.
author diego
date Thu, 17 May 2007 21:13:41 +0000
parents d2f0839dc721
children 39c0107471df
comparison
equal deleted inserted replaced
23313:d2f0839dc721 23314:4ec3dd8f6093
7201 7201
7202 _def_linux='#undef TARGET_LINUX' 7202 _def_linux='#undef TARGET_LINUX'
7203 linux && _def_linux='#define TARGET_LINUX 1' 7203 linux && _def_linux='#define TARGET_LINUX 1'
7204 7204
7205 # TODO cleanup the VIDIX stuff here 7205 # TODO cleanup the VIDIX stuff here
7206 echocheck "VIDIX (internal)" 7206 echocheck "VIDIX"
7207 echores "$_vidix_internal" 7207 if test "$_vidix_internal" = yes; then
7208 7208 _res_comment="internal"
7209 echocheck "VIDIX (external)" 7209 _vidix_external=no
7210 if test "$_vidix_external" = auto; then 7210 elif test "$_vidix_external" = auto; then
7211 _vidix_external=no 7211 _vidix_external=no
7212 cat > $TMPC <<EOF 7212 cat > $TMPC <<EOF
7213 #include <vidix/vidix.h> 7213 #include <vidix/vidix.h>
7214 int main(void) { return 0; } 7214 int main(void) { return 0; }
7215 EOF 7215 EOF
7216 cc_check -lvidix && _vidix_external=yes 7216 cc_check -lvidix && _vidix_external=yes && _res_comment="external"
7217 fi 7217 fi
7218 echores "$_vidix_external"
7219
7220 if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then 7218 if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then
7221 _vidix=yes 7219 _vidix=yes
7222 _def_vidix='#define CONFIG_VIDIX 1' 7220 _def_vidix='#define CONFIG_VIDIX 1'
7223 else 7221 else
7224 _vidix=no 7222 _vidix=no
7225 _def_vidix='#undef CONFIG_VIDIX' 7223 _def_vidix='#undef CONFIG_VIDIX'
7226 fi 7224 fi
7225 echores "$_vidix"
7227 7226
7228 if test "$_vidix" = yes ; then 7227 if test "$_vidix" = yes ; then
7229 if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e cyberblade`; then 7228 if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e cyberblade`; then
7230 _def_vidix_drv_cyberblade='#define CONFIG_VIDIX_DRV_CYBERBLADE 1' 7229 _def_vidix_drv_cyberblade='#define CONFIG_VIDIX_DRV_CYBERBLADE 1'
7231 _vidix_drv_cyberblade=yes 7230 _vidix_drv_cyberblade=yes