From e55016647a2893efb0b930b3d350a4d73b6745e0 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 31 May 2008 05:44:14 +0000
Subject: [PATCH] Don't use both -framework OpenGL and -lGL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 4 +++-
 configure.in | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 5d1b9e3039..d0db6376b1 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 53806 2008-05-29 00:45:58Z KO .
+# From configure.in Id: configure.in 53822 2008-05-29 17:04:18Z KO .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8.
 #
@@ -32377,6 +32377,8 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
+    elif test "$USE_DARWIN" = 1; then
+        OPENGL_LIBS=""
     else
                         echo "$as_me:$LINENO: checking for OpenGL headers" >&5
 echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 1fd15cfaad..4fa989cff5 100644
--- a/configure.in
+++ b/configure.in
@@ -4189,6 +4189,8 @@ if test "$wxUSE_OPENGL" = "yes"; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
+    elif test "$USE_DARWIN" = 1; then
+        OPENGL_LIBS=""
     else
         dnl adjust CPPFLAGS to include GL/gl.h location if necessary
         dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)