From d3da92aea4e865b72194ecc76e0eab6e2a1179a3 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 14 Apr 2012 15:02:28 +0200
Subject: cocoa_common, gl_common: add OSX specific getProcAddress

Run dlopen on the OpenGL dynamic library instead of on the binary.
This should prevent crashes due to function conflicts when X11/lGL is
linked.

Remove mutual exclusion of the X11 and Cocoa backends.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 4a6e209d3a..7b99766d2d 100755
--- a/configure
+++ b/configure
@@ -4544,7 +4544,7 @@ int main(int argc, char *argv[]) {
 EOF
   _gl=no
   for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do
-    if test "$_cocoa" != yes && cc_check $_ld_tmp $_ld_lm ; then
+    if cc_check $_ld_tmp $_ld_lm ; then
       _gl=yes
       _gl_x11=yes
       libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl"
-- 
cgit v1.2.3