Commit 009781d4 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont Committed by Alexandre Julliard

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

parent 0624e17e
...@@ -8150,7 +8150,7 @@ done ...@@ -8150,7 +8150,7 @@ done
if test "x$with_opengl" != "xno" if test "x$with_opengl" != "xno"
then 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 then
{ { echo "$as_me:$LINENO: error: /usr/X11R6/lib/libGL.a is present on your system. { { 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 This prevents linking to OpenGL. Delete the file and restart configure." >&5
......
...@@ -353,8 +353,8 @@ then ...@@ -353,8 +353,8 @@ then
dnl Check for the presence of OpenGL dnl Check for the presence of OpenGL
if test "x$with_opengl" != "xno" if test "x$with_opengl" != "xno"
then 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 then
AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system. AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system.
This prevents linking to OpenGL. Delete the file and restart configure.]) This prevents linking to OpenGL. Delete the file and restart configure.])
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment