Log:
Andrew Lewycky <andrew@transgaming.com>
Ove Kaaven <ovek@transgaming.com>
Check for common broken nVidia+Mesa OpenGL library setups.
Add some quoting.
Index: wine/configure.in
diff -u wine/configure.in:1.1.1.25 wine/configure.in:1.50
--- wine/configure.in:1.1.1.25 Wed Jan 16 10:58:58 2002
+++ wine/configure.in Fri Jan 18 09:28:22 2002
@@ -253,6 +281,14 @@
) dnl *** End of X11/Xlib.h check
dnl Check for the presence of OpenGL
+
+ if test -e /usr/X11R6/lib/libGL.a -a ! -e /usr/X11R6/lib/libGL.so
+ 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
+
if test $OPENGL = "yes" -o $OPENGL = "normal"
then
AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h)
@@ -287,9 +323,8 @@
,,
$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
- if test $ac_cv_lib_GL_glXCreateContext = "yes"
+ if test "$ac_cv_lib_GL_glXCreateContext" = "yes"
then
-
OPENGLFILES='$(OPENGLFILES)'
AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])
@@ -298,7 +333,7 @@
[Define if the OpenGL library supports the glXGetProcAddressARB call]),,
$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
- if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes"
+ if test "$ac_cv_lib_GL_glXGetProcAddressARB" = "yes"
then
AC_CACHE_CHECK([for OpenGL extension functions prototypes], wine_cv_extension_prototypes,
[AC_TRY_COMPILE([#include <GL/gl.h>
@@ -311,7 +346,7 @@
[wine_cv_extension_prototypes="no"]
)]
)
- if test $wine_cv_extension_prototypes = "yes"
+ if test "$wine_cv_extension_prototypes" = "yes"
then
AC_DEFINE(HAVE_GLEXT_PROTOTYPES, 1,
[Define if the OpenGL headers define extension typedefs])
