ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Moved the libGL.a check to the final warnings.

This commit is contained in:
Alexandre Julliard 2006-09-22 09:36:12 +02:00
parent c4704c2d7e
commit c84c47842e
2 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure vendored
View File

@ -9494,30 +9494,15 @@ fi
echo "${ECHO_T}$ac_cv_lib_GL_glXCreateContext" >&6; } echo "${ECHO_T}$ac_cv_lib_GL_glXCreateContext" >&6; }
if test $ac_cv_lib_GL_glXCreateContext = yes; then if test $ac_cv_lib_GL_glXCreateContext = yes; then
OPENGL_LIBS="-lGL" OPENGL_LIBS="-lGL"
OPENGLFILES='$(OPENGLFILES)'
fi
if test "$ac_cv_lib_GL_glXCreateContext" = "yes"
then
OPENGLFILES='$(OPENGLFILES)'
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_OPENGL 1 #define HAVE_OPENGL 1
_ACEOF _ACEOF
else
if test -f /usr/X11R6/lib/libGL.a fi
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; }; }
else
wine_cv_opengl_libs_found="no"
fi
fi
{ echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5 { echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5
echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; } echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; }
@ -25579,7 +25564,7 @@ echo "$as_me: WARNING: isn't what you want anyway. You will need to install deve
echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;}
fi fi
if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" if test -z "$OPENGLFILES"
then then
echo >&2 echo >&2
{ echo "$as_me:$LINENO: WARNING: Wine will be build without OpenGL or Direct3D support" >&5 { echo "$as_me:$LINENO: WARNING: Wine will be build without OpenGL or Direct3D support" >&5
@ -25595,11 +25580,18 @@ echo "$as_me: WARNING: No OpenGL development headers were found" >&2;}
then then
{ echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&5 { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&5
echo "$as_me: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&2;} echo "$as_me: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&2;}
fi elif test "$ac_cv_lib_GL_glXCreateContext" = "no"
if test "$wine_cv_opengl_libs_found" = "no"
then then
{ echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5 if test -f /usr/X11R6/lib/libGL.a
then
{ echo "$as_me:$LINENO: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&5
echo "$as_me: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&2;}
else
{ echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5
echo "$as_me: WARNING: No OpenGL library found on this system." >&2;} echo "$as_me: WARNING: No OpenGL library found on this system." >&2;}
fi
fi fi
fi fi

32
configure.ac
View File

@ -413,25 +413,12 @@ then
then then
dnl Check for the presence of the library dnl Check for the presence of the library
AC_CHECK_LIB(GL,glXCreateContext, AC_CHECK_LIB(GL,glXCreateContext,
OPENGL_LIBS="-lGL" [OPENGL_LIBS="-lGL"
OPENGLFILES='$(OPENGLFILES)'
AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])]
,, ,,
$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
if test "$ac_cv_lib_GL_glXCreateContext" = "yes"
then
OPENGLFILES='$(OPENGLFILES)'
AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])
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.])
else
dnl The compile test most likely failed because no libGL.so was found
wine_cv_opengl_libs_found="no"
fi
fi
dnl Check for GLU32 library. dnl Check for GLU32 library.
AC_CHECK_LIB(GLU,gluLookAt, AC_CHECK_LIB(GLU,gluLookAt,
[OPENGL_LIBS="$OPENGL_LIBS -lGLU" [OPENGL_LIBS="$OPENGL_LIBS -lGLU"
@ -1975,7 +1962,7 @@ then
AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.])
fi fi
if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" if test -z "$OPENGLFILES"
then then
echo >&2 echo >&2
AC_MSG_WARN([Wine will be build without OpenGL or Direct3D support]) AC_MSG_WARN([Wine will be build without OpenGL or Direct3D support])
@ -1987,10 +1974,15 @@ then
if test "$wine_cv_opengl_header_version_OK" = "no" if test "$wine_cv_opengl_header_version_OK" = "no"
then then
AC_MSG_WARN([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) AC_MSG_WARN([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).])
fi elif test "$ac_cv_lib_GL_glXCreateContext" = "no"
if test "$wine_cv_opengl_libs_found" = "no"
then then
AC_MSG_WARN([No OpenGL library found on this system.]) if test -f /usr/X11R6/lib/libGL.a
then
AC_MSG_WARN([/usr/X11R6/lib/libGL.a is present on your system.
This probably prevents linking to OpenGL. Try deleting the file and restarting configure.])
else
AC_MSG_WARN([No OpenGL library found on this system.])
fi
fi fi
fi fi