Also check for /usr/X11R6/lib/libGL.dylib.

009781d4 · Pierre d'Herbemont · Alexandre Julliard · 0624e17e · 009781d4 · 009781d4
Commit 009781d4 authored Jun 20, 2005 by Pierre d'Herbemont Committed by Alexandre Julliard Jun 20, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

configure configure +1 -1

configure.ac configure.ac +2 -2

No files found.
--- a/configure
+++ b/configure
@@ -8150,7 +8150,7 @@ done

        if test "x$with_opengl" != "xno"
    then
-        if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so
+        if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so -a ! -f /usr/X11R6/lib/libGL.dylib
        then
 	    { { echo "$as_me:$LINENO: error: /usr/X11R6/lib/libGL.a is present on your system.
 This prevents linking to OpenGL. Delete the file and restart configure." >&5

--- a/configure.ac
+++ b/configure.ac
@@ -353,8 +353,8 @@ then
    dnl Check for the presence of OpenGL
    if test "x$with_opengl" != "xno"
    then
-        if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so
-        then
+        if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so -a ! -f /usr/X11R6/lib/libGL.dylib
+        then 
 	    AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system.
 This prevents linking to OpenGL. Delete the file and restart configure.])
        fi