Mercurial > mplayer.hg
changeset 2998:535930d5a8ac
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 | 7a4eb5a45288 |
| files | configure |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Nov 19 12:04:19 2001 +0000 +++ b/configure Mon Nov 19 12:29:48 2001 +0000 @@ -1217,7 +1217,7 @@ ######### echocheck "X11" -if test "$_x11" = auto ; then +if test "$_x11" = auto || test "$_x11" = yes ; then cat > $TMPC <<EOF #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -1231,6 +1231,8 @@ _vosrc="$_vosrc vo_x11.c" else _def_x11='#undef HAVE_X11' + _inc_x11='' + _ld_x11='' fi echores "$_x11" @@ -1385,7 +1387,7 @@ echocheck "OpenGL" -if test "$_gl" = auto ; then +if test "$_x11" = yes && test "$_gl" = auto ; then cat > $TMPC << EOF #include <GL/gl.h> int main(void) { return 0; } @@ -1401,6 +1403,8 @@ _gl=no cc_check $_inc_x11 $_ld_x11 -lGL -lm && _gl=yes fi +else + _gl=no fi if test "$_gl" = yes ; then #FIXME ?? : bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread"