Fixing cross-compiling w/ OpenGL

[Paul Millar]

Hi,

Cross-compiling doesn't work if the host computer has (native) OpenGL
libraries installed.  This patch fixes the configuration script so it warns
(rather than throws an error) if the static library is found.

ChangeLog:
  Issue a warning rather than an error, if the static (native) OpenGL library
  is found.

Cheers,

Paul.

Index: configure
===================================================================
RCS file: /home/wine/wine/configure,v
retrieving revision 1.765
diff -u -r1.765 configure
--- configure	10 Mar 2006 20:52:28 -0000	1.765
+++ configure	12 Mar 2006 15:03:26 -0000
@@ -8214,11 +8214,12 @@
 		else
                     if test -f /usr/X11R6/lib/libGL.a
                     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
-echo "$as_me: error: /usr/X11R6/lib/libGL.a is present on your system.
-This prevents linking to OpenGL. Delete the file and restart configure." >&2;}
-   { (exit 1); exit 1; }; }
+                       { echo "$as_me:$LINENO: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
+This library may be old, not containing glXCreateContext.
+If other libraries contain this symbol, then delete this file and restart configure." >&5
+echo "$as_me: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
+This library may be old, not containing glXCreateContext.
+If other libraries contain this symbol, then delete this file and restart configure." >&2;}
                     fi
 		fi
 
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.453
diff -u -r1.453 configure.ac
--- configure.ac	8 Mar 2006 12:09:21 -0000	1.453
+++ configure.ac	12 Mar 2006 15:03:27 -0000
@@ -404,8 +404,9 @@
 		else
                     if test -f /usr/X11R6/lib/libGL.a
                     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.])
+                       AC_MSG_WARN([/usr/X11R6/lib/libGL.a is present on your system.
+This library may be old, not containing glXCreateContext.
+If other libraries contain this symbol, then delete this file and restart configure.])
                     fi
 		fi
 



-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20060312/e606f0ef/attachment.pgp