Fixing cross-compilation 1/2
Paul Millar
paul at astro.gla.ac.uk
Sun Apr 23 11:23:12 CDT 2006
Hi,
The patch fixes an existing test within the autoconf configure.ac. The test
makes assumptions about the linker, which are wrong:
1. for cross-compliation (MinGW linker doesn't go near /usr/X11R6/lib)
2. under X11R7.0, the libraries have moved to /usr/lib (at least under
Debian)
I'd be happy to just remove the test, but there may be some obscure users for
whom the information may be relevant. I've kept the test, rewording it
slightly and downgraded it from an error to a warning.
This is a resubmission (no comment from previous submission) so please comment
if its wrong!
Cheers,
Paul.
ChangeLog:
Downgrade configure test because it gets it wrong sometimes.
Index: configure
===================================================================
RCS file: /home/wine/wine/configure,v
retrieving revision 1.795
diff -u -r1.795 configure
--- configure 18 Apr 2006 17:13:20 -0000 1.795
+++ configure 22 Apr 2006 22:08:07 -0000
@@ -8529,11 +8529,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.481
diff -u -r1.481 configure.ac
--- configure.ac 18 Apr 2006 17:13:20 -0000 1.481
+++ configure.ac 22 Apr 2006 22:08:07 -0000
@@ -430,8 +430,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
More information about the wine-patches
mailing list