Fix libGL.a check on configure

Anderson Lizardo andersonlizardo at yahoo.com.br
Sun Jun 26 22:01:38 CDT 2005


Hi,

Changelog:

Fixed the libGL.a configure check for systems where
/usr/X11R6/lib/libGL.so is a symbolic link.


PS.: I've not used a simple "test -e" because
http://www.winehq.org/hypermail/wine-patches/2002/01/0206.html says this
does not work on Solaris.
-- 
Anderson Lizardo
-------------- next part --------------
? dlls/user/tests/.clipboard.c.swp
Index: configure
===================================================================
RCS file: /home/wine/wine/configure,v
retrieving revision 1.663
diff -u -u -r1.663 configure
--- configure	20 Jun 2005 15:52:16 -0000	1.663
+++ configure	27 Jun 2005 02:52:16 -0000
@@ -8150,7 +8150,12 @@
 
         if test "x$with_opengl" != "xno"
     then
-        if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so -a ! -f /usr/X11R6/lib/libGL.dylib
+        if test -f /usr/X11R6/lib/libGL.a -a \
+         ! -f /usr/X11R6/lib/libGL.so -a \
+         ! -f /usr/X11R6/lib/libGL.dylib -a \
+         ! -L /usr/X11R6/lib/libGL.a -a \
+         ! -L /usr/X11R6/lib/libGL.so -a \
+         ! -L /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
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.366
diff -u -u -r1.366 configure.ac
--- configure.ac	20 Jun 2005 15:52:16 -0000	1.366
+++ configure.ac	27 Jun 2005 02:52:17 -0000
@@ -353,7 +353,12 @@
     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 -a ! -f /usr/X11R6/lib/libGL.dylib
+        if test -f /usr/X11R6/lib/libGL.a -a \
+         ! -f /usr/X11R6/lib/libGL.so -a \
+         ! -f /usr/X11R6/lib/libGL.dylib -a \
+         ! -L /usr/X11R6/lib/libGL.a -a \
+         ! -L /usr/X11R6/lib/libGL.so -a \
+         ! -L /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.])


More information about the wine-patches mailing list