comparison configure @ 24715:0bd9dc0d3863

Simplify directfb/dfbmga test.
author diego
date Mon, 08 Oct 2007 11:42:47 +0000
parents d6d3ee8591fe
children 1778b750c438
comparison
equal deleted inserted replaced
24714:d6d3ee8591fe 24715:0bd9dc0d3863
3815 _dfb_micro=`echo $_directfb_version | cut -d . -f 3` 3815 _dfb_micro=`echo $_directfb_version | cut -d . -f 3`
3816 _dfb_version=`dfb_version $_dfb_major $_dfb_minor $_dfb_micro` 3816 _dfb_version=`dfb_version $_dfb_major $_dfb_minor $_dfb_micro`
3817 if test "$_dfb_version" -ge `dfb_version 0 9 13`; then 3817 if test "$_dfb_version" -ge `dfb_version 0 9 13`; then
3818 _def_directfb_version="#define DIRECTFBVERSION $_dfb_version" 3818 _def_directfb_version="#define DIRECTFBVERSION $_dfb_version"
3819 _res_comment="$_directfb_version" 3819 _res_comment="$_directfb_version"
3820 test "$_dfb_version" -ge `dfb_version 0 9 15` && _dfbmga=yes
3820 else 3821 else
3821 _def_directfb_version='#undef DIRECTFBVERSION' 3822 _def_directfb_version='#undef DIRECTFBVERSION'
3822 _directfb=no 3823 _directfb=no
3823 _res_comment="version >=0.9.13 required" 3824 _res_comment="version >=0.9.13 required"
3824 fi 3825 fi
3832 if test "$_directfb" = yes ; then 3833 if test "$_directfb" = yes ; then
3833 _def_directfb='#define HAVE_DIRECTFB 1' 3834 _def_directfb='#define HAVE_DIRECTFB 1'
3834 _vosrc="$_vosrc vo_directfb2.c" 3835 _vosrc="$_vosrc vo_directfb2.c"
3835 _vomodules="directfb $_vomodules" 3836 _vomodules="directfb $_vomodules"
3836 _libs_mplayer="$_libs_mplayer -ldirectfb" 3837 _libs_mplayer="$_libs_mplayer -ldirectfb"
3837
3838 if test "$_dfb_version" -ge `dfb_version 0 9 15`; then
3839 _vosrc="$_vosrc vo_dfbmga.c"
3840 _vomodules="dfbmga $_vomodules"
3841 _def_dfbmga='#define HAVE_DFBMGA 1'
3842 else
3843 _novomodules="dfbmga $_novomodules"
3844 _def_dfbmga='#undef HAVE_DFBMGA'
3845 fi
3846 else 3838 else
3847 _def_directfb='#undef HAVE_DIRECTFB' 3839 _def_directfb='#undef HAVE_DIRECTFB'
3848 _novomodules="dfbmga directfb $_novomodules" 3840 _novomodules="directfb $_novomodules"
3841 fi
3842 if test "$_dfbmga" = yes; then
3843 _vosrc="$_vosrc vo_dfbmga.c"
3844 _vomodules="dfbmga $_vomodules"
3845 _def_dfbmga='#define HAVE_DFBMGA 1'
3846 else
3847 _novomodules="dfbmga $_novomodules"
3848 _def_dfbmga='#undef HAVE_DFBMGA'
3849 fi 3849 fi
3850 3850
3851 3851
3852 echocheck "X11 headers presence" 3852 echocheck "X11 headers presence"
3853 _x11_headers="no" 3853 _x11_headers="no"