libGL.a test on darwin [Fixed]

Pierre d'Herbemont stegefin at free.fr
Sat Jun 11 05:53:29 CDT 2005


On 11 juin 05, at 12:50, Pierre d'Herbemont wrote:
> Alexandre,
>
>  This patch address the issue when ./configure-ing, on Mac OS X:
> ** /usr/X11R6/lib/libGL.a is present on your system.
> **  This prevents linking to OpenGL. Delete the file and restart  
> configure.
>
> I would have used LIBEXT to do that but that would have involved  
> some larger code changes, since LIBEXT is defined after. So here is  
> a quick fix.
>

Sorry again, wrong patch.

Thanks,

Pierre.

ChangeLog:
- Make the /usr/X11R6/lib/libGL.* check to check also for dylib.


-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.362
diff -u -r1.362 configure.ac
--- configure.ac	9 Jun 2005 10:21:31 -0000	1.362
+++ configure.ac	11 Jun 2005 10:45:41 -0000
@@ -353,8 +353,9 @@
     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
+        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
-------------- next part --------------




More information about the wine-patches mailing list