From 09b8d9402fc6039b60358b529b4afdaddc4a72d4 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 21:57:13 +0000 Subject: Pass a proper va_list type to vsscanf() test in configure. This fixes the check on SuperH with CodeSourcery compilers. patch by Bill Traynor, wmat naoi ca git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index ce8aecb127..108ba52a45 100755 --- a/configure +++ b/configure @@ -3745,7 +3745,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include #include -int main(void) { vsscanf(0, 0, 0); return 0; } +int main(void) { va_list ap; vsscanf(0, 0, ap); return 0; } EOF _vsscanf=no cc_check && _vsscanf=yes -- cgit v1.2.3 From ff44ac1a3c5e8cfde01c58e493ff12880ecc748b Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:28:44 +0000 Subject: Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 108ba52a45..7f1437e0b6 100755 --- a/configure +++ b/configure @@ -3377,7 +3377,7 @@ echocheck "dynamic loader" cat > $TMPC << EOF #include #include -int main(void) { dlopen(NULL, 0); dlclose(NULL); dlsym(NULL, NULL); return 0; } +int main(void) { dlopen("", 0); dlclose(NULL); dlsym(NULL, ""); return 0; } EOF _dl=no for _ld_tmp in "" "-ldl" ; do @@ -3745,7 +3745,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include #include -int main(void) { va_list ap; vsscanf(0, 0, ap); return 0; } +int main(void) { va_list ap; vsscanf("foo", "bar", ap); return 0; } EOF _vsscanf=no cc_check && _vsscanf=yes -- cgit v1.2.3 From 22298a8e570b35e9626b22020ce70fa1f89b4220 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:29:55 +0000 Subject: Remove pointless printf call in libmp3lame test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 7f1437e0b6..a02c1ac0a4 100755 --- a/configure +++ b/configure @@ -7489,7 +7489,7 @@ if test "$_mp3lame" = auto ; then cat > $TMPC < int main(void) { lame_version_t lv; (void) lame_init(); - get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); + get_lame_version_numerical(&lv); return 0; } EOF cc_check -lmp3lame $_ld_lm && _mp3lame=yes -- cgit v1.2.3 From e4ce50305bb4985005ff9e7e0d03c1cf8516bee7 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:30:41 +0000 Subject: Add missing stdlib.h #include to fribidi check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index a02c1ac0a4..f4d9452c30 100755 --- a/configure +++ b/configure @@ -6256,6 +6256,7 @@ _ld_tmp="" if test "$_fribidi" = auto ; then cat > $TMPC << EOF #include +#include /* workaround for fribidi 0.10.4 and below */ #define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8 #include -- cgit v1.2.3 From c202adb9f46dcf4ffeff4f508b7e32957fdf24f6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:32:28 +0000 Subject: Remove pointless variable declaration from DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index f4d9452c30..8ca9c0d645 100755 --- a/configure +++ b/configure @@ -4138,7 +4138,7 @@ if test "$_directfb" = auto ; then _directfb=no cat > $TMPC < -int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; } +int main(void) { DirectFBInit(0, 0); return 0; } EOF for _inc_tmp in "" -I/usr/local/include/directfb \ -I/usr/include/directfb -I/usr/local/include; do -- cgit v1.2.3 From f80ece49a89ceceb4ae3f81f8026fc9858dab291 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Jan 2010 10:54:41 +0000 Subject: Move MatrixView video output check below OpenGL check, it depends on OpenGL. patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8ca9c0d645..de0f8e33a3 100755 --- a/configure +++ b/configure @@ -4607,19 +4607,6 @@ else fi echores "$_mga" -echocheck "MatrixView" -if test "$_gl" = no ; then - matrixview=no -fi -if test "$matrixview" = yes ; then - _vomodules="matrixview $_vomodules" - def_matrixview='#define CONFIG_MATRIXVIEW 1' -else - _novomodules="matrixview $_novomodules" - def_matrixview='#undef CONFIG_MATRIXVIEW' -fi -echores "$matrixview" - echocheck "xmga" if test "$_xmga" = auto ; then _xmga=no @@ -4983,6 +4970,20 @@ fi echores "$_gl" +echocheck "MatrixView" +if test "$_gl" = no ; then + matrixview=no +fi +if test "$matrixview" = yes ; then + _vomodules="matrixview $_vomodules" + def_matrixview='#define CONFIG_MATRIXVIEW 1' +else + _novomodules="matrixview $_novomodules" + def_matrixview='#undef CONFIG_MATRIXVIEW' +fi +echores "$matrixview" + + echocheck "PNG support" if test "$_png" = auto ; then _png=no -- cgit v1.2.3