Mercurial > mplayer.hg

comparison configure @ 2998:535930d5a8ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix x11 linking when --disable-x11 used (btw sdl may still require it) fix GL always detected even when x11 disabled
author pl
date Mon, 19 Nov 2001 12:29:48 +0000
parents 49b34fdc48bb
children 605efb97f981
comparison
equal deleted inserted replaced
2997:49b34fdc48bb 2998:535930d5a8ac
1215 ######### 1215 #########
1216 # VIDEO # 1216 # VIDEO #
1217 ######### 1217 #########
1218 1218
1219 echocheck "X11" 1219 echocheck "X11"
1220 if test "$_x11" = auto ; then 1220 if test "$_x11" = auto || test "$_x11" = yes ; then
1221 cat > $TMPC <<EOF 1221 cat > $TMPC <<EOF
1222 #include <X11/Xlib.h> 1222 #include <X11/Xlib.h>
1223 #include <X11/Xutil.h> 1223 #include <X11/Xutil.h>
1224 int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; } 1224 int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
1225 EOF 1225 EOF
1229 if test "$_x11" = yes ; then 1229 if test "$_x11" = yes ; then
1230 _def_x11='#define HAVE_X11 1' 1230 _def_x11='#define HAVE_X11 1'
1231 _vosrc="$_vosrc vo_x11.c" 1231 _vosrc="$_vosrc vo_x11.c"
1232 else 1232 else
1233 _def_x11='#undef HAVE_X11' 1233 _def_x11='#undef HAVE_X11'
1234 _inc_x11=''
1235 _ld_x11=''
1234 fi 1236 fi
1235 echores "$_x11" 1237 echores "$_x11"
1236 1238
1237 1239
1238 echocheck "DPMS" 1240 echocheck "DPMS"
1383 fi 1385 fi
1384 echores "$_dga2" 1386 echores "$_dga2"
1385 1387
1386 1388
1387 echocheck "OpenGL" 1389 echocheck "OpenGL"
1388 if test "$_gl" = auto ; then 1390 if test "$_x11" = yes && test "$_gl" = auto ; then
1389 cat > $TMPC << EOF 1391 cat > $TMPC << EOF
1390 #include <GL/gl.h> 1392 #include <GL/gl.h>
1391 int main(void) { return 0; } 1393 int main(void) { return 0; }
1392 EOF 1394 EOF
1393 _gl=no 1395 _gl=no
1399 _ld_gl="-lGL -lm $_ld_pthread" 1401 _ld_gl="-lGL -lm $_ld_pthread"
1400 else 1402 else
1401 _gl=no 1403 _gl=no
1402 cc_check $_inc_x11 $_ld_x11 -lGL -lm && _gl=yes 1404 cc_check $_inc_x11 $_ld_x11 -lGL -lm && _gl=yes
1403 fi 1405 fi
1406 else
1407 _gl=no
1404 fi 1408 fi
1405 if test "$_gl" = yes ; then 1409 if test "$_gl" = yes ; then
1406 #FIXME ?? : bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread" 1410 #FIXME ?? : bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread"
1407 _def_gl='#define HAVE_GL 1' 1411 _def_gl='#define HAVE_GL 1'
1408 _vosrc="$_vosrc vo_gl.c vo_gl2.c" 1412 _vosrc="$_vosrc vo_gl.c vo_gl2.c"