From 4fe7e1b3e9ff866d51ec2b86880acbbedc86d6ec Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 1 Dec 2010 20:50:12 +0000
Subject: CONFIGURE: Fix OpenGL library detection on OS X in case MESA is
 installed.

svn-id: r54722
---
 configure | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index e95ec9f080..d24dd73c66 100755
--- a/configure
+++ b/configure
@@ -2666,10 +2666,14 @@ EOF
 
 	_opengl=no
 	# Try different library names
-	# 1) GL                 This is usually used on POSIX systems
-	# 2) opengl32           This is used on Windows
-	# 3) -framework OpenGL  This is used on Mac OS X
-	for lib in "-lGL" "-lopengl32" "-framework OpenGL"; do
+	# 1) -framework OpenGL  This is used on Mac OS X
+	# 2) GL                 This is usually used on POSIX systems
+	# 3) opengl32           This is used on Windows
+	#
+	# We try "-framework OpenGL" first here to assure it will always be
+	# picked up by the configure script on Mac OS X, even when a libGL
+	# exists.
+	for lib in "-framework OpenGL" "-lGL" "-lopengl32"; do
 		if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
 			then
 			_opengl=yes
-- 
cgit v1.2.3