summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-20 09:26:44 +0000
committerpl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-20 09:26:44 +0000
commita9cd780dd1cdfd35ea56f367fac50a3eec61bccd (patch)
tree1ed6d48c2460cec49cde5464e41b5f1531b933bb
parent16fd9547171d08f087cf8fc98372d97a8c300e82 (diff)
downloadmpv-a9cd780dd1cdfd35ea56f367fac50a3eec61bccd.tar.bz2
mpv-a9cd780dd1cdfd35ea56f367fac50a3eec61bccd.tar.xz
when --enable-gl was used, linker flags (_ld_gl) were not set (found by Nick K)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3019 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 120fc45409..bb4190c4bd 100755
--- a/configure
+++ b/configure
@@ -1438,7 +1438,8 @@ echores "$_dga2"
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 @@ else
_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
@@ -1887,6 +1887,7 @@ else
_def_rtc='#undef HAVE_RTC'
fi
+
echocheck "mad support"
if test "$_mad" = auto ; then
_mad=no