Mercurial > mplayer.hg
changeset 15405:93ae97c2de4c
If libggi has been found, search for the libggiwmh extension
w/o relying on it.
patch by Christoph Egger <Christoph_Egger at gmx dot de>
| author | diego |
|---|---|
| date | Wed, 11 May 2005 08:01:52 +0000 |
| parents | 3448e7c4da37 |
| children | 04c47e9acab3 |
| files | configure |
| diffstat | 1 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed May 11 06:35:36 2005 +0000 +++ b/configure Wed May 11 08:01:52 2005 +0000 @@ -248,6 +248,7 @@ --enable-aa build with AAlib render support [autodetect] --enable-caca build with CACA render support [autodetect] --enable-ggi build with GGI render support [autodetect] + --enable-ggiwmh build with GGI libggiwmh extension [autodetect] --enable-directx build with DirectX support [autodetect] --enable-dxr2 build with DXR2 render support [autodetect] --enable-dxr3 build with DXR3/H+ render support [autodetect] @@ -1312,6 +1313,7 @@ _gif=auto _gl=auto _ggi=auto +_ggiwmh=auto _aa=auto _caca=auto _svga=auto @@ -1477,6 +1479,8 @@ --disable-gl) _gl=no ;; --enable-ggi) _ggi=yes ;; --disable-ggi) _ggi=no ;; + --enable-ggiwmh) _ggiwmh=yes ;; + --disable-ggiwmh) _ggiwmh=no ;; --enable-aa) _aa=yes ;; --disable-aa) _aa=no ;; --enable-caca) _caca=yes ;; @@ -3818,6 +3822,27 @@ fi echores "$_ggi" +echocheck "GGI extension: libggiwmh" +if test "$_ggiwmh" = auto ; then + _ggiwmh=no + cat > $TMPC << EOF +#include <ggi/ggi.h> +#include <ggi/wmh.h> +int main(void) { return 0; } +EOF + cc_check -lggi -lggiwmh && _ggiwmh=yes +fi +# needed to get right output on obscure combination +# like --disable-ggi --enable-ggiwmh +if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then + _def_ggiwmh='#define HAVE_GGIWMH 1' + _ld_ggi="$_ld_ggi -lggiwmh" +else + _ggiwmh=no + _def_ggiwmh='#undef HAVE_GGIWMH' +fi +echores "$_ggiwmh" + echocheck "AA" if test "$_aa" = auto ; then @@ -7583,6 +7608,7 @@ $_def_sdlbuggy $_def_directx $_def_ggi +$_def_ggiwmh $_def_3dfx $_def_tdfxfb $_def_tdfxvid