[Mplayer-cvslog] CVS: main configure,1.276,1.277

pl pl at mplayer.dev.hu
Tue Nov 20 10:26:47 CET 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv11866

Modified Files:
	configure 
Log Message:
when --enable-gl was used, linker flags (_ld_gl) were not set (found by Nick K)


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- configure	20 Nov 2001 07:53:20 -0000	1.276
+++ configure	20 Nov 2001 09:26:44 -0000	1.277
@@ -1438,7 +1438,8 @@
 
 
 echocheck "OpenGL"
-if test "$_x11" = yes && test "$_gl" = auto ; then
+#Note: this test is run even with --enable-gl since we autodetect $_ld_gl
+if test "$_x11" = yes && test "$_gl" != no ; then
   cat > $TMPC << EOF
 #include <GL/gl.h>
 int main(void) { return 0; }
@@ -1458,7 +1459,6 @@
   _gl=no
 fi
 if test "$_gl" = yes ; then
-  #FIXME ?? :  bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread"
   _def_gl='#define HAVE_GL 1'
   _vosrc="$_vosrc vo_gl.c vo_gl2.c"
 else
@@ -1886,6 +1886,7 @@
 else
   _def_rtc='#undef HAVE_RTC'
 fi
+
 
 echocheck "mad support"
 if test "$_mad" = auto ; then




More information about the MPlayer-cvslog mailing list